Merge branch 'devel' into dbeaver/pro#7844-cb-lsp-server

.github/workflows/frontend-build.yml

@@ -46,7 +46,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: "24.13.1"
+          node-version: "lts/*"
           cache: "yarn"
           cache-dependency-path: |
             cloudbeaver/webapp/yarn.lock

.github/workflows/frontend-lint.yml

@@ -25,7 +25,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: "24.13.1"
+          node-version: "lts/*"
           cache: "yarn"
           cache-dependency-path: "./cloudbeaver/webapp/yarn.lock"
 

.github/workflows/push-pr-devel.yml

@@ -6,7 +6,6 @@ on:
       - opened
       - synchronize
       - reopened
-      - ready_for_review
   push:
     branches: [devel]
 
@@ -25,6 +24,11 @@ jobs:
       project-deps: ./cloudbeaver/project.deps
       timeout-minutes: 5
 
+  # build-server:
+  #   name: Server
+  #   uses: ./.github/workflows/backend-build.yml
+  #   secrets: inherit
+
   build-frontend:
     name: Frontend
     uses: ./.github/workflows/frontend-build.yml
@@ -34,33 +38,12 @@ jobs:
     name: Server
     uses: dbeaver/dbeaver-common/.github/workflows/java-checkstyle.yml@devel
     secrets: inherit
-    permissions:
-      contents: read
-      pull-requests: read
 
   lint-frontend:
     name: Frontend
     uses: ./.github/workflows/frontend-lint.yml
     secrets: inherit
 
-  required-builds:
-    name: Required Builds
-    if: ${{ always() && github.event.pull_request.draft != true }}
-    needs: [build-server, build-frontend]
-    runs-on: ubuntu-latest
-    permissions: {}
-    steps:
-      - name: Verify required builds
-        env:
-          SERVER_RESULT: ${{ needs.build-server.result }}
-          FRONTEND_RESULT: ${{ needs.build-frontend.result }}
-        run: |
-          if [[ "$SERVER_RESULT" != "success" || "$FRONTEND_RESULT" != "success" ]]; then
-            echo "Server build: $SERVER_RESULT"
-            echo "Frontend build: $FRONTEND_RESULT"
-            exit 1
-          fi
-
   # call-frontend-tests:
   #   name: Frontend Unit Tests
   #   needs: call-frontend-build

.vscode/extensions.json

@@ -14,6 +14,7 @@
     "redhat.vscode-yaml",
     "streetsidesoftware.code-spell-checker",
     "streetsidesoftware.code-spell-checker-russian",
+    "syler.sass-indented",
     "github.copilot-chat",
     "yzhang.markdown-all-in-one",
     "GraphQL.vscode-graphql-syntax",
@@ -21,4 +22,4 @@
     "esbenp.prettier-vscode",
     "devnaumov.licensify"
   ]
-}
+}

.vscode/launch.json

@@ -48,7 +48,6 @@
         "-Declipse.pde.launch=true",
         "-XstartOnFirstThread",
         "-Dfile.encoding=UTF-8",
-        "--enable-native-access=ALL-UNNAMED",
         "--add-modules=ALL-DEFAULT",
         "--add-opens=java.base/java.io=ALL-UNNAMED",
         "--add-opens=java.base/java.lang=ALL-UNNAMED",
@@ -65,6 +64,7 @@
         "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED",
         "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
         "--add-opens=java.base/sun.security.ssl=ALL-UNNAMED",
+        "--add-opens=java.base/sun.security.action=ALL-UNNAMED",
         "--add-opens=java.base/sun.security.util=ALL-UNNAMED",
         "--add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED",
         "--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED",

.vscode/vscode-java-configs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-java-configs",
-  "packageManager": "yarn@4.14.1",
+  "packageManager": "yarn@4.9.2",
   "devDependencies": {
     "typescript": "^5.8.3"
   }

AGENTS.md

@@ -1,96 +0,0 @@
-# CloudBeaver
-
-## What is CloudBeaver?
-
-CloudBeaver is an open-source, web-based database management application. Its modular frontend provides the database navigator, SQL editor, data editor, administration, and related features, and communicates with the CloudBeaver server through GraphQL.
-
-## Frontend
-
-### Scope
-
-- These instructions apply to the frontend under `webapp/` in CloudBeaver Community Edition and to any other CloudBeaver edition or product that shares this frontend architecture.
-- Do not modify `server/`, `deploy/`, or backend configuration unless the task explicitly requires it. Backend GraphQL schemas are an input to frontend code generation, not part of the default edit scope.
-- Treat `package.json`, `.yarnrc.yml`, and the frontend CI workflows as the source of truth for tool and runtime versions; do not duplicate their version numbers in documentation.
-
-### Project map
-
-- `webapp/package.json`: Yarn Plug'n'Play workspace root and repository-wide frontend scripts.
-- `webapp/packages/core-*`: shared application foundations, services, UI primitives, state, and infrastructure.
-- `webapp/packages/plugin-*`: feature modules. A package normally registers services and bootstraps in `src/module.ts` and exposes its public API from `src/index.ts`.
-- `webapp/packages/product-*`: CE product composition and Vite entry points. `product-default` is the runnable/bundled frontend; `product-default-impl` selects the CE plugin set.
-- `webapp/packages/core-sdk`: GraphQL operations and generated client types.
-- `webapp/common-typescript/@dbeaver/*` and `webapp/common-react/@dbeaver/*`: shared DBeaver utilities and React components used by the workspace.
-- Tests are colocated with source as `*.test.ts` or `*.test.tsx`; styles are usually colocated CSS modules.
-
-### Stack
-
-TypeScript ES modules, React, MobX, the project DI/module registry, GraphQL Code Generator, Vite, Yarn workspaces with PnP, Vitest and Testing Library, ESLint, Prettier, CSS Modules, and Tailwind-based theming.
-
-### Setup and common commands
-
-Use the Node version configured by frontend CI and the Yarn version pinned in `webapp/package.json`. Run frontend commands from `webapp/` unless noted.
-
-```sh
-corepack enable
-cd webapp
-yarn install --immutable
-```
-
-```sh
-# Start the frontend dev server; a compatible CloudBeaver API must run separately.
-(cd packages/product-default && yarn dev)
-
-# From webapp/: repository-wide checks.
-yarn lint
-yarn test
-yarn validate-dependencies
-
-# Production frontend build.
-(cd packages/product-default && yarn bundle)
-```
-
-For a focused check, use a package's existing script, for example `yarn workspace @cloudbeaver/core-utils test` or `yarn workspace @cloudbeaver/plugin-sql-editor lint`. Do not invent a package script that is absent from its `package.json`.
-
-### Working conventions
-
-- Put changes in the smallest package that owns the behavior. Prefer existing `core-*` abstractions and UI primitives before adding cross-package helpers.
-- Keep dependencies directed from plugins to core: `core-*` packages must never import or depend on `plugin-*` packages. Plugins may use public APIs from core packages and from other plugins, subject to the administration boundary and the no-cycles rule below.
-- Put administration-only behavior in a separate package whose name ends with `-administration`. Public/non-administration plugins must not import or depend on administration packages.
-- Keep the workspace package dependency graph acyclic; do not introduce direct or indirect circular dependencies.
-- Import workspace packages through their public `@cloudbeaver/*` or `@dbeaver/*` exports; never reach into another package's `src/` directory.
-- When adding a workspace dependency, update the package's `package.json` through Yarn. The configured `ts-project-linker` synchronizes `tsconfig.json` project references during a non-immutable install; edit references manually only if automatic linking cannot complete. Run `yarn validate-dependencies` afterward.
-- Register services and bootstraps through the package's `src/module.ts`. Change product composition only when enabling or disabling a package for the CE product.
-- Put user-visible text in the package localization files and follow the neighboring `LocaleService` pattern; do not hardcode UI copy in components.
-- Add or change GraphQL operations as `.gql` files in `core-sdk`. Regenerate through `yarn workspace @cloudbeaver/core-sdk gql:gen`; never edit the ignored generated `src/sdk.ts` manually.
-- Preserve valid license headers on existing source files. When modifying an existing source file, update the ending copyright year to the current four-digit calendar year while keeping its original starting year. For new source files, use the template below and replace `<CURRENT_YEAR>` with the current year; never leave the placeholder in committed code. Use the repository ESLint and Prettier configuration rather than manual formatting rules.
-- Do not edit or commit generated/install artifacts such as `node_modules/`, `.pnp.*`, `lib/`, `dist/`, `coverage/`, or `allure-results/`.
-- Add focused tests for behavior changes. Before handoff, run lint and tests for affected packages; run the repository-wide checks and product bundle for cross-cutting or product-composition changes.
-
-### License header for new source files
-
-```text
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-<CURRENT_YEAR> DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-```
-
-## Backend
-
-- Before backend work, read and follow `../dbeaver/AGENTS.md` for inherited Java and Tycho conventions.
-- Cloudbeaver does not use SWT or Eclipse RCP, and its backend is headless.
-- Configuration file is generated using `apps/config-generator`. For making changes there, update `config/template/cloudbeaver-base.conf` or use patches (for specific product parameters).
-- The backend must support at least the following databases: PostgreSQL, MySQL, Oracle, and SQL Server. Support for additional databases is optional.
-
-### GraphQL API
-
-- Use consistent names. IDs must use type `ID`; ID arguments and inputs must end with `Id`, for example `projectId`.
-- Top-level methods follow `{pluginId}{methodName}`, for example `authLogin`, `rmListProjects`, and `navNodeChildren`. Mark new public API with `@since`.
-- Preserve released APIs: deprecate instead of renaming or removing, include the deprecation version, and remove only after more than one year. EA-only APIs may change before public release.
-- New arguments and input fields added to a released API must be optional.
-
-### License header
-- Please use header from ../dbeaver/docs/license_header.txt for backend source files.

README.md

@@ -5,16 +5,13 @@
 Cloud Database Manager - Community Edition.  
 CloudBeaver is a web server that provides a rich web interface. The server itself is a Java application, and the web part is written in TypeScript and React.  
 It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
+See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details. 
 
 <a><img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/></a>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/gis-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/data-transfer-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/sql-editor-demo.png" width="400"/>
 
-## Documentation
-- [GitHub WIKI](https://github.com/dbeaver/cloudbeaver/wiki)
-- [Official documentation](https://dbeaver.com/docs/cloudbeaver/)
-
 ## Run in Docker
 
 - [Official Docker repository](https://hub.docker.com/r/dbeaver/cloudbeaver)
@@ -22,85 +19,61 @@ It is free to use and open-source (licensed under [Apache 2](https://github.com/
 
 ## Demo server
 
-You can see a live demo of CloudBeaver server here: https://demo.cloudbeaver.io  
+You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io  
 
 [Database access instructions](https://github.com/dbeaver/cloudbeaver/wiki/Demo-Server)
 
 ## Changelog
 
-### 26.2.0 2026-08-31
+### 26.0.0 2026-03-02
 
-### Changes since 26.1.0
+### Changes since 25.3.0:
 
-- AI Assistant:
-  - Added AI Chat to help users generate and fix queries and explore data more easily. It’s integrated with the SQL Editor to run generated queries instantly. All AI features can be turned off in the Server configuration.
-  - Added the ability to use multiple AI configurations for working with the AI chat. Administrators can define tokens, engines and models for OpenAI and Copilot in the Administration panel for each AI profile separately. After that, users can switch between these profiles while using AI features.
-  - Added the ability to cancel a response in the AI Chat to stop response generation when needed.
-  - The "Endpoint" setting was renamed to "API Base URL" for the OpenAI provider.
-  - Added AI engine icons to AI configuration profiles, making it easier to identify AI providers in the Administration panel and AI Chat configuration.
-- Administration:
-  - Added the database version and the driver version to diagnostic logs.
-  - Fixed the issue of fetching groups during LDAP authorization. CloudBeaver now provides all matched groups regardless of fetching errors.
-  - Added the Last Login time to the user form and the user table in the administration part.
-- Authorization:
-  - Added the option to upload files for certificates and keys in the SSL authorization configuration.
-  - Fixed an issue causing the application to lose connection to the database after extended uptime. Access is kept automatically during long-running sessions.
-- Data Editor:
-  - Added the References panel to the Data Editor. The panel displays related records from connected tables. Users can explore table relationships directly.
-  - Added the ability to export generated SQL to a .sql file from the Generate SQL dialog.
-  - Fixed copying of large JSON values in the Data Editor - now the full value can be copied.
-  - Resolved an issue where the Data Editor ignored the text preview's maximum length quota. Increasing this quota now enables the ability to edit large values.
-- Data Transfer:
-  - Added advanced data import settings, including database-specific replace methods, transaction support, bulk loading, and the option to use a separate connection for data import.
-  - Improved memory usage when importing large CSV files to improve the application performance.
-- Accessibility:
-  - Improved accessibility for the search on the Users section in the Administration panel. The application allows focusing on the search field with the Tab key.
-  - Added a loader to the Save button in the Administration panel to improve indication of the long-performing operations.
-  - Improved drag-and-drop in the Navigator Tree for objects by enlarging the auto-scroll trigger areas.
-  - Added the ability to expand and collapse code block elements, including JSON, using the keyboard in the Data Editor.
-  - Fixed shortcuts behavior for AZERTY keyboards. Now shortcuts like Ctrl/Cmd + Z work correctly.
-  - Added the ability to use the Enter or space keys to turn checkboxes on/off in the connection properties tab.
-- General:
-  - Added connection types to visually distinguish database connections using background colors across the Database Navigator and application UI.
-  - Improved SQL autocomplete suggestion ordering for object names. Now suggestions are sorted alphabetically.
-  - Added a Project Info tab containing the project description to the project context menu.
-  - Fixed synchronization between devices. Users see updated connections and folders in other devices without manual refreshes.
-- Databases:
-  - ClickHouse
-        - The driver was updated to version 0.10.0
-        - Improved JSON display in the Value panel
-        - Added support for the Map data type visualization for the Data Editor
-  - The Databend driver was updated to version 0.4.8.
-  - LibSQL: Added support for database views.
-  - MySQL: Fixed support for comments starting with '#' symbol in the SQL Editor.
-  - PostgreSQL
-        - Updated the driver to version 42.7.13.
-        - Added a Show full DDL option for schemas and tables to generate complete DDL, including objects within a schema and object comments and privileges.
-        - Fixed an error that occurred when applying filters to database nodes
-        - Fixed generated calls for procedures with OUT parameters
-- Security:
-  - Removed the ability to rename SQL scripts that start with dots to prevent them from being moved outside the Scripts directory into the root Tree.
-  - Added a new "Auto-create users" setting for the reverse proxy provider, allowing new user creation on login. It is enabled by default.
-  - Fixed a security flaw allowing unauthorized users to test database connections. The application now requires proper permissions for this action, preventing malicious requests and protecting server files.
-  - Fixed a security flaw in the LDAP authentication process. The application validates the username input to prevent unauthorized access and protect directory data.
-  - Fixed a cross-site scripting vulnerability caused by unsanitized user input in the web interface.
-  - Resolved a security flaw related to user-controlled file paths by adding strict validation to prevent unauthorized resource access.
-  - Updated session handling to prevent session fixation vulnerabilities. The application generates new session identifiers upon login.
-  - Updated the PostgreSQL JDBC driver to version 42.7.13, including a fix for a high-severity security vulnerability (CVE-2026-54291).
-  - Fixed the critical vulnerability (CVE-2026-59873) in the tar library. The library was updated to version 7.5.19.
-  - Fixed the critical vulnerability (CVE-2026-9277) in the shell-quote library (updated to version 1.8.4)
-  - Fixed the high vulnerability (CVE-2026-10050) in the jetty-security library. The library was updated to version 12.1.11.
-  - Fixed the high vulnerability (CVE-2026-14257) in the brace-expansion library. The library was updated to version 5.0.8.
-  - Fixed the high vulnerability (GHSA-r28c-9q8g-f849) in the postcss library. The library was updated to version 8.5.18.
-  - Fixed the high vulnerability (GHSA-pm4m-ph32-ghv5) in the js-yaml library. The library was updated to version 5.2.2.
-  - Fixed the high vulnerability (CVE-2026-59880) in the immutable library. The library was updated to version 5.1.8.
-  - Fixed the high vulnerability (CVE-2026-59879) in the fast-uri library. The library was updated to version 3.1.3.
-  - Fixed the high vulnerability (CVE-2026-13311) in the shell-quote library. The library was updated to version 1.9.0.
-  - Fixed the high vulnerability (GHSA-gcfj-64vw-6mp9) in the axios library. The library was updated to version 1.18.0.
-  - Fixed the high vulnerability (CVE-2026-67213) in the nanoid library. The library was updated to version 3.3.17.
-  - Fixed the high vulnerability (CVE-2025-71329) in the less library. The library was updated to version 4.7.0.
-  - Fixed the high vulnerability (CVE-2026-13697) in the undici library. The library was updated to version 8.9.0.
-  - Fixed the high vulnerability (CVE-2026-18446) in the fast-uri library. The library was updated to version 4.1.2.
-  - Fixed the high vulnerability (CVE-2026-69152) in the brace-expansion library. The library was updated to version 5.0.9.
-  - Fixed the high vulnerability (GHSA-gv7w-rqvm-qjhr) in the esbuild library. The library was updated to version 0.28.1.
-  - Fixed the high vulnerability (CVE-2026-12143) in the form-data library. The library was updated to version 4.0.6.
+  - Security:
+    - Enforced complete logout and screen data clearance upon session expiration;
+    - Fixed the high vulnerability (CVE-2026-25639) in the axios library. The library was updated to version 1.13.5.
+  - Administration:
+    - Added support for mapping users to CloudBeaver teams based on LDAP memberOf group membership;
+    - Change the User list settings in the Administration part to show both active and inactive users by default.
+  - SQL Editor:
+    - Added support for parameters and variables in queries. This feature allows queries to be reused by changing parameters at execution time. Enabled by default and configurable in personal preferences;
+    - Added SQL preview to the Bind parameters/variables dialog to review queries with changed values on the fly;
+    - Enabled Tab key for autocompletion in the SQL Editor alongside the Enter key;
+    - Added a new setting in the SQL Editor to highlight spaces, tabs, and other whitespace characters to help users read, debug, and maintain their scripts. It is turned off by default and can be configured in personal preferences;
+    - Dangerous query confirmation is now shown for all DROP statements, not just for tables.
+  - Data Editor:
+    - Added ability to automatically generate INSERT, SELECT, DELETE, and UPDATE statements for the selected values;
+    - Added undo and redo functionality for cell edits, row operations, and other data modifications. Retains the last 50 actions across the Data Editor, result sets, and related panels;
+    - Added "Use local formatting" setting. Users can choose how to display numbers and dates: using the OS locale, a custom locale, or keeping values unformatted. This formatting applies only to displayed values. Data in the database remains unchanged;
+    - Added column pinning to keep key columns (e.g., IDs, names) visible while horizontal scrolling through wide tables;
+    - Added status indicator icon in the top-left corner with tooltips explaining table editability. Indicates presence of primary keys, read-only connection settings, or read-only columns;
+    - Added shortcut Ctrl/Cmd + . to cancel operations in Data Editor;
+    - Fixed application freeze in canceling fetch size requests for large tables.
+  - Navigator tree:
+    - Added the ability to duplicate connection configuration in the project navigation tree. The "Clone connection" feature is available in the context menu;
+    - Added the ability for users to configure the Simple or Advanced view in the Navigation tree for all connections or for each connection separately;
+    - Added the ability to show table objects, such as columns or keys, in the Navigation tree. The setting is disabled by default and can be turned on in the Navigator settings panel;
+    - Added the ability to rename connections via context menu in the Navigation Tree;
+    - Added Connection Info tab to display basic information about the current connection for all users.
+  - General:
+    - Added support for long polling as a fallback when WebSockets are unavailable or blocked. Ensures reliable communication for metadata updates and SQL execution;
+    - Extended browser support to versions up to three years old;
+    - Redesigned the connection configuration page. Reorganized form fields and sections to provide more input space and reduce visual clutter;
+    - Expanded pointer target areas for icons in the Navigator, editors, and tabs according to the accessibility standards;
+    - Fixed a keyboard navigation issue for panels to keep the focus inside;
+    - Renamed "Database Native" authentication type to "Username/password" in the connection dialog;
+    - Fixed issue where the missing pg_dump utility caused errors during initialization or deployment updates when PostgreSQL was selected as the inner database.
+  - Databases:
+  - ClickHouse:
+    - Updated driver to version 0.9.5
+    - Added spatial data support
+    - Fixed an issue with displaying arrays of UUID, IPv4/IPv6, and Map types
+    - Fixed JSON data type reading
+    - Resolved an issue with CTE expressions
+  - DuckDB:
+    - Updated driver to version 1.4.4.0;
+    - Added support for the dollar-quoted string syntax for the SQL Editor
+  - Oracle: Added a new "Set Username to OS_USER" option in the Misc section of Oracle connection settings. Automatically uses the current database username as the operating system user identifier in session metadata when enabled;
+  - PostgreSQL: Added DDL display support for PostgreSQL policies.
+
+[We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.

SECURITY.md

@@ -1,6 +1,18 @@
 # Security Policy
 
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported |
+| ------- | --------- |
+| 22.x    | yes       |
+| 23.x    | yes       |
+| 24.x    | yes       |
+
 ## Reporting a Vulnerability
 
-Please report (suspected) security vulnerabilities to <security@dbeaver.com>.
+Please report (suspected) security vulnerabilities to devops@dbeaver.com.
+You will receive a response from us within 48 hours.
 If the issue is confirmed, we will release a patch as soon as possible, depending on complexity, but historically, within a few days.

apps/config-generator/pom.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>io.cloudbeaver</groupId>
-    <artifactId>config-generator</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.14.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <mainClass>io.cloudbeaver.ConfigGenerator</mainClass>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
-                <executions>
-                    <execution>
-                        <id>copy-external-config</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}/config</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.basedir}/../../config/template</directory>
-                                    <includes>
-                                        <include>cloudbeaver-base.conf</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

apps/config-generator/src/main/java/io/cloudbeaver/ConfigGenerator.java

@@ -1,235 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver;
-
-import com.google.gson.*;
-import com.google.gson.reflect.TypeToken;
-
-import java.io.Reader;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-
-public class ConfigGenerator {
-
-    private static final Gson gson = new GsonBuilder()
-        .setPrettyPrinting()
-        .disableHtmlEscaping()
-        .create();
-    private static final String EMPTY_STRING = "''";
-
-
-    public static void main(String[] args) throws Exception {
-        String baseConfigPath = System.getProperty("config.base");
-        if (baseConfigPath == null || baseConfigPath.isEmpty()) {
-            URL resource = ConfigGenerator.class.getClassLoader().getResource("config/cloudbeaver-base.conf");
-            if (resource == null) {
-                System.out.println("Base config path is required");
-                return;
-            }
-            baseConfigPath = resource.toURI().getPath();
-            if (System.getProperty("os.name").toLowerCase().contains("win")) {
-                // Fix for Windows in dev mode. Resource URI starts with / (e.g. /C:/some/folder)
-                // And this breaks Java NIO
-                if (baseConfigPath.startsWith("/")) {
-                    baseConfigPath = baseConfigPath.substring(1);
-                }
-            }
-        }
-        String outputPath = System.getProperty("config.output");
-        if (outputPath == null || outputPath.isEmpty()) {
-            System.out.println("Output config path is required");
-            return;
-        }
-
-        String configPatches = System.getProperty("config.patches");
-
-        List<String> overrideConfigs = configPatches == null ? List.of() : Arrays.asList(configPatches.split(","));
-
-        Map<String, Object> config = readConfigurationFile(baseConfigPath);
-        System.out.println("Base config loaded");
-
-        for (String overrideConfig : overrideConfigs) {
-            if (Files.exists(Path.of(overrideConfig))) {
-                System.out.println("Applying override config: " + overrideConfig);
-            } else {
-                System.out.println("Override config not found, skipping: " + overrideConfig);
-                continue;
-            }
-            System.out.println("Processing override config: " + overrideConfig);
-            Map<String, Object> overrideConfigMap = readConfigurationFile(overrideConfig);
-            System.out.println("Override config loaded: " + overrideConfig);
-            applyProductConfig(config, overrideConfigMap);
-            System.out.println("Override config applied: " + overrideConfig);
-        }
-
-        Map<String, Object> finalMap = convertToOutputFormat(config);
-        System.out.println("Config converted to output format");
-
-        writeConfigurationFile(finalMap, outputPath);
-        System.out.println("Config written to: " + outputPath);
-    }
-
-    private static Map<String, Object> readConfigurationFile(String filePath) throws Exception {
-        Path path = Path.of(filePath);
-        if (!Files.exists(path)) {
-            throw new IllegalArgumentException("Configuration file not found: " + filePath);
-        }
-
-        try (Reader reader = Files.newBufferedReader(path)) {
-            return gson.fromJson(reader, TypeToken.getParameterized(Map.class, String.class, Object.class).getType());
-        }
-    }
-
-    private static void applyProductConfig(Map<String, Object> baseConfig, Map<String, Object> productConfig) {
-        if (productConfig.containsKey("add")) {
-            Map<String, Object> add = (Map<String, Object>) productConfig.get("add");
-            deepMergeMap(baseConfig, add);
-        }
-
-        if (productConfig.containsKey("remove")) {
-            Map<String, Object> remove = (Map<String, Object>) productConfig.get("remove");
-            deepRemoveMap(baseConfig, remove);
-        }
-    }
-
-    private static void deepMergeMap(Map<String, Object> target, Map<String, Object> source) {
-        for (Map.Entry<String, Object> entry : source.entrySet()) {
-            Object sourceValue = entry.getValue();
-            Object targetValue = target.get(entry.getKey());
-
-            if (sourceValue instanceof Map && targetValue instanceof Map) {
-                deepMergeMap((Map<String, Object>) targetValue, (Map<String, Object>) sourceValue);
-            } else {
-                target.put(entry.getKey(), sourceValue);
-            }
-        }
-    }
-
-    private static void deepRemoveMap(Map<String, Object> target, Map<String, Object> source) {
-        for (Map.Entry<String, Object> entry : source.entrySet()) {
-            Object sourceValue = entry.getValue();
-            Object targetValue = target.get(entry.getKey());
-
-            if (sourceValue instanceof Map && targetValue instanceof Map) {
-                deepRemoveMap((Map<String, Object>) targetValue, (Map<String, Object>) sourceValue);
-            } else {
-                target.remove(entry.getKey());
-            }
-        }
-    }
-
-    private static void writeConfigurationFile(Map<String, Object> map, String filePath) throws Exception {
-        JsonElement tree = gson.toJsonTree(map);
-        StringBuilder sb = new StringBuilder();
-        writeElement(tree, sb, 0);
-        Files.write(Path.of(filePath), sb.toString().getBytes());
-    }
-
-    private static void writeElement(JsonElement elem, StringBuilder sb, int count) {
-        String indent = "    ";
-        if (elem.isJsonObject()) {
-            sb.append("{\n");
-            JsonObject obj = elem.getAsJsonObject();
-            var iterator = obj.entrySet().iterator();
-
-            while (iterator.hasNext()) {
-                var entry = iterator.next();
-                sb.repeat(indent, count + 1).append(entry.getKey()).append(": ");
-                writeElement(entry.getValue(), sb, count + 1);
-                if (iterator.hasNext()) {
-                    sb.append(",");
-                }
-                sb.append("\n");
-            }
-            sb.repeat(indent, count).append("}");
-
-        } else if (elem.isJsonArray()) {
-            sb.append("[\n");
-            JsonArray array = elem.getAsJsonArray();
-            for (int i = 0; i < array.size(); i++) {
-                sb.repeat(indent, count + 1);
-                writeElement(array.get(i), sb, count + 1);
-                if (i < array.size() - 1) {
-                    sb.append(",");
-                }
-                sb.append("\n");
-            }
-            sb.repeat(indent, count).append("]");
-
-        } else {
-            String valueStr = gson.toJson(elem).replace("\n", "\n" + indent);
-            sb.append(valueStr);
-        }
-    }
-
-    private static Map<String, Object> convertToOutputFormat(Map<String, Object> map) {
-        Map<String, Object> result = new LinkedHashMap<>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            result.put(entry.getKey(), convertValue(entry.getValue()));
-        }
-        return result;
-    }
-
-    private static Object convertValue(Object value) {
-        if (value instanceof Map) {
-            Map<String, Object> map = (Map<String, Object>) value;
-            if (!map.isEmpty() && map.containsKey("value")) {
-                if (map.containsKey("env")) {
-                    String env = (String) map.get("env");
-                    Object defValue = map.get("value");
-                    return "${" + env + ":" + formatDefaultValue(defValue) + "}";
-                } else {
-                    return convertValue(map.get("value"));
-                }
-            }
-            Map<String, Object> result = new LinkedHashMap<>();
-            for (Map.Entry<String, Object> entry : map.entrySet()) {
-                result.put(entry.getKey(), convertValue(entry.getValue()));
-            }
-            return result;
-        } else if (value instanceof List) {
-            List<Object> list = (List<Object>) value;
-            List<Object> result = new ArrayList<>();
-            for (Object item : list) {
-                result.add(convertValue(item));
-            }
-            return result;
-        }
-        return value;
-    }
-
-    private static String formatDefaultValue(Object value) {
-        return switch (value) {
-            case null -> EMPTY_STRING;
-            case String str -> str.isEmpty() ? EMPTY_STRING : str;
-            case Boolean b -> value.toString();
-            case Number number -> {
-                if (number instanceof Double || number instanceof Float) {
-                    long longVal = number.longValue();
-                    if (longVal == number.doubleValue()) {
-                        yield String.valueOf(longVal);
-                    }
-                }
-                yield number.toString();
-            }
-            // TODO: handle list elements if needed
-            default -> value.toString();
-        };
-    }
-}

config/core/cloudbeaver.conf

@@ -0,0 +1,99 @@
+{
+    server: {
+        serverPort: "${CLOUDBEAVER_WEB_SERVER_PORT:8978}",
+        forceHttps: "${CLOUDBEAVER_FORCE_HTTPS:false}",
+
+        contentRoot: "web",
+        driversLocation: "drivers",
+
+        sslConfigurationPath:"${CLOUDBEAVER_SSL_CONF_PATH:workspace/.data/ssl-config.xml}",
+
+        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
+        serviceURI: "/api/",
+        supportedHosts: [],
+
+        productSettings: {
+            # Global properties
+            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:system}",
+            core.localization.language: "${CLOUDBEAVER_CORE_LOCALIZATION:en}",
+            plugin.sql-editor.autoSave: "${CLOUDBEAVER_SQL_EDITOR_AUTOSAVE:true}",
+            plugin.sql-editor.disabled: "${CLOUDBEAVER_SQL_EDITOR_DISABLED:false}",
+            # max size of the file that can be uploaded to the editor (in kilobytes)
+            plugin.sql-editor.maxFileSize: "${CLOUDBEAVER_SQL_EDITOR_MAX_FILE_SIZE:10240}",
+            plugin.log-viewer.disabled: "${CLOUDBEAVER_LOG_VIEWER_DISABLED:false}",
+            plugin.log-viewer.logBatchSize: "${CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE:1000}",
+            plugin.log-viewer.maxLogRecords: "${CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS:2000}",
+            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}",
+            SQLEditor.ContentAssistant.experimental.mode: "${CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE:NEW}"
+        },
+
+        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
+        bindSessionToIp: "${CLOUDBEAVER_BIND_SESSION_TO_IP:disable}",
+        develMode: "${CLOUDBEAVER_DEVEL_MODE:false}",
+
+        enableSecurityManager: false,
+
+        sm: {
+            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
+            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
+            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
+            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
+            passwordPolicy: {
+                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
+                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
+                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
+                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
+            }
+        },
+
+        database: {
+            driver: "${CLOUDBEAVER_DB_DRIVER:h2_embedded_v2}",
+            url: "${CLOUDBEAVER_DB_URL:jdbc:h2:${workspace}/.data/cb.h2v2.dat}",
+            schema: "${CLOUDBEAVER_DB_SCHEMA:''}",
+            user: "${CLOUDBEAVER_DB_USER:''}",
+            password: "${CLOUDBEAVER_DB_PASSWORD:''}",
+            initialDataConfiguration: "${CLOUDBEAVER_DB_INITIAL_DATA:conf/initial-data.conf}",
+            pool: {
+                minIdleConnections: "${CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS:4}",
+                maxIdleConnections: "${CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS:10}",
+                maxConnections: "${CLOUDBEAVER_DB_MAX_CONNECTIONS:100}",
+                validationQuery: "${CLOUDBEAVER_DB_VALIDATION_QUERY:SELECT 1}"
+            },
+            backupEnabled: "${CLOUDBEAVER_DB_BACKUP_ENABLED:true}"
+        }
+
+    },
+    app: {
+        anonymousAccessEnabled: "${CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED:true}",
+        anonymousUserRole: user,
+        defaultUserTeam: "${CLOUDBEAVER_APP_DEFAULT_USER_TEAM:user}",
+        grantConnectionsAccessToAnonymousTeam: "${CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM:false}",
+        supportsCustomConnections: "${CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS:false}",
+        showReadOnlyConnectionInfo: "${CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO:false}",
+        systemVariablesResolvingEnabled: "${CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED:false}",
+
+        forwardProxy: "${CLOUDBEAVER_APP_FORWARD_PROXY:false}",
+
+        publicCredentialsSaveEnabled: "${CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED:true}",
+        adminCredentialsSaveEnabled: "${CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED:true}",
+
+        resourceManagerEnabled: "${CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED:true}",
+
+        resourceQuotas: {
+            resourceManagerFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT:500000}",
+            sqlMaxRunningQueries: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES:100}",
+            sqlResultSetRowsLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT:100000}",
+            sqlTextPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH:4096}",
+            sqlBinaryPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH:261120}"
+        },
+        enabledAuthProviders: [
+            "local"
+        ],
+
+        disabledBetaFeatures: [
+
+        ]
+
+    }
+
+}

config/template/cloudbeaver-base.conf

@@ -1,271 +0,0 @@
-{
-    server: {
-        serverPort: {
-            env: "CLOUDBEAVER_WEB_SERVER_PORT",
-            value: 8978
-        },
-
-        forceHttps: {
-            env: "CLOUDBEAVER_FORCE_HTTPS",
-            value: false
-        },
-
-        contentRoot: {
-            env: "CLOUDBEAVER_CONTENT_ROOT",
-            value: "web"
-        },
-
-        driversLocation: {
-            env: "CLOUDBEAVER_DRIVERS_LOCATION",
-            value: "drivers"
-        },
-
-        sslConfigurationPath: {
-            env: "CLOUDBEAVER_SSL_CONF_PATH",
-            value: "workspace/.data/ssl-config.xml"
-        },
-
-        rootURI: {
-            env: "CLOUDBEAVER_ROOT_URI",
-            value: "/"
-        },
-
-        serviceURI: {
-            env: "CLOUDBEAVER_SERVICE_URI",
-            value: "/api/"
-        },
-
-        supportedHosts: [],
-
-        productSettings: {
-            core.theming.theme: {
-                env: "CLOUDBEAVER_CORE_THEMING_THEME",
-                value: "system"
-            },
-            core.localization.language: {
-                env: "CLOUDBEAVER_CORE_LOCALIZATION",
-                value: "en"
-            },
-            plugin.sql-editor.autoSave: {
-                env: "CLOUDBEAVER_SQL_EDITOR_AUTOSAVE",
-                value: true
-            },
-            plugin.sql-editor.disabled: {
-                env: "CLOUDBEAVER_SQL_EDITOR_DISABLED",
-                value: false
-            },
-            plugin.sql-editor.maxFileSize: {
-                env: "CLOUDBEAVER_SQL_EDITOR_MAX_FILE_SIZE",
-                value: 10240
-            },
-            plugin.log-viewer.disabled: {
-                env: "CLOUDBEAVER_LOG_VIEWER_DISABLED",
-                value: false
-            },
-            plugin.log-viewer.logBatchSize: {
-                env: "CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE",
-                value: 1000
-            },
-            plugin.log-viewer.maxLogRecords: {
-                env: "CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS",
-                value: 2000
-            },
-            sql.proposals.insert.table.alias: {
-                env: "CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS",
-                value: "PLAIN"
-            },
-            SQLEditor.ContentAssistant.experimental.mode: {
-                env: "CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE",
-                value: "NEW"
-            }
-        },
-
-        expireSessionAfterPeriod: {
-            env: "CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD",
-            value: 1800000
-        },
-
-        bindSessionToIp: {
-            env: "CLOUDBEAVER_BIND_SESSION_TO_IP",
-            value: "disable"
-        },
-
-        develMode: {
-            env: "CLOUDBEAVER_DEVEL_MODE",
-            value: false
-        },
-
-        sm: {
-            enableBruteForceProtection: {
-                env: "CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED",
-                value: true
-            },
-            maxFailedLogin: {
-                env: "CLOUDBEAVER_MAX_FAILED_LOGINS",
-                value: 10
-            },
-            minimumLoginTimeout: {
-                env: "CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT",
-                value: 1
-            },
-            blockLoginPeriod: {
-                env: "CLOUDBEAVER_BLOCK_PERIOD",
-                value: 300
-            },
-
-            passwordPolicy: {
-                minLength: {
-                    env: "CLOUDBEAVER_POLICY_MIN_LENGTH",
-                    value: 8
-                },
-                requireMixedCase: {
-                    env: "CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE",
-                    value: true
-                },
-                minNumberCount: {
-                    env: "CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT",
-                    value: 1
-                },
-                minSymbolCount: {
-                    env: "CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT",
-                    value: 0
-                }
-            }
-        },
-
-        database: {
-            driver: {
-                env: "CLOUDBEAVER_DB_DRIVER",
-                value: "h2_embedded_v2"
-            },
-            url: {
-                env: "CLOUDBEAVER_DB_URL",
-                value: "jdbc:h2:${workspace}/.data/cb.h2v2.dat"
-            },
-            schema: {
-                env: "CLOUDBEAVER_DB_SCHEMA",
-                value: ""
-            },
-            user: {
-                env: "CLOUDBEAVER_DB_USER",
-                value: ""
-            },
-            password: {
-                env: "CLOUDBEAVER_DB_PASSWORD",
-                value: ""
-            },
-            initialDataConfiguration: {
-                env: "CLOUDBEAVER_DB_INITIAL_DATA",
-                value: "conf/initial-data.conf"
-            },
-
-            pool: {
-                minIdleConnections: {
-                    env: "CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS",
-                    value: 4
-                },
-                maxIdleConnections: {
-                    env: "CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS",
-                    value: 10
-                },
-                maxConnections: {
-                    env: "CLOUDBEAVER_DB_MAX_CONNECTIONS",
-                    value: 100
-                },
-                validationQuery: {
-                    env: "CLOUDBEAVER_DB_VALIDATION_QUERY",
-                    value: "SELECT 1"
-                }
-            },
-
-            backupEnabled: {
-                env: "CLOUDBEAVER_DB_BACKUP_ENABLED",
-                value: true
-            }
-        }
-    },
-
-    app: {
-        anonymousAccessEnabled: {
-            env: "CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED",
-            value: true
-        },
-
-        anonymousUserRole: {
-            env: "CLOUDBEAVER_APP_ANONYMOUS_USER_ROLE",
-            value: "user"
-        },
-
-        defaultUserTeam: {
-            env: "CLOUDBEAVER_APP_DEFAULT_USER_TEAM",
-            value: "user"
-        },
-
-        grantConnectionsAccessToAnonymousTeam: {
-            env: "CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM",
-            value: false
-        },
-
-        supportsCustomConnections: {
-            env: "CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS",
-            value: false
-        },
-
-        showReadOnlyConnectionInfo: {
-            env: "CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO",
-            value: false
-        },
-
-        systemVariablesResolvingEnabled: {
-            env: "CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED",
-            value: false
-        },
-
-        forwardProxy: {
-            env: "CLOUDBEAVER_APP_FORWARD_PROXY",
-            value: false
-        },
-
-        publicCredentialsSaveEnabled: {
-            env: "CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED",
-            value: true
-        },
-
-        adminCredentialsSaveEnabled: {
-            env: "CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED",
-            value: true
-        },
-
-        resourceManagerEnabled: {
-            env: "CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED",
-            value: true
-        },
-
-        resourceQuotas: {
-            resourceManagerFileSizeLimit: {
-                env: "CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT",
-                value: 500000
-            },
-            sqlMaxRunningQueries: {
-                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES",
-                value: 100
-            },
-            sqlResultSetRowsLimit: {
-                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT",
-                value: 100000
-            },
-            sqlTextPreviewMaxLength: {
-                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH",
-                value: 4096
-            },
-            sqlBinaryPreviewMaxLength: {
-                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH",
-                value: 261120
-            }
-        },
-
-        enabledAuthProviders: ["local"],
-
-        disabledBetaFeatures: []
-    }
-}

deploy/build-backend.sh

@@ -18,6 +18,7 @@ cd ../..
 echo "Pull dbeaver platform"
 [ ! -d dbeaver ] && git clone --depth 1 https://github.com/dbeaver/dbeaver.git
 [ ! -d dbeaver-common ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git
+[ ! -d dbeaver-jdbc-libsql ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-jdbc-libsql.git
 
 
 cd cloudbeaver/deploy
@@ -31,9 +32,6 @@ if [[ "$?" -ne 0 ]] ; then
 fi
 cd ../../../deploy
 
-echo "Generate cloudbeaver.conf file"
-mvn -f ../apps/config-generator compile exec:java -Dconfig.output="cloudbeaver/conf/cloudbeaver.conf"
-
 echo "Copy server packages"
 
 cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server

deploy/build-frontend.sh

@@ -8,15 +8,7 @@ mkdir -p ./cloudbeaver/web
 cd ../../cloudbeaver/webapp
 
 yarn install --immutable
-yarn clear
-
-cd common-react
-yarn clear
-
-cd ../common-typescript
-yarn clear
-
-cd ../packages/product-default
+cd ./packages/product-default
 yarn run bundle
 
 if [[ "$?" -ne 0 ]] ; then

deploy/build.bat

@@ -20,6 +20,7 @@ echo Pull dbeaver platform
 
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
 IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
+IF NOT EXIST dbeaver-jdbc-libsql git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git
 
 cd cloudbeaver\deploy
 
@@ -42,9 +43,6 @@ copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.js
 
 move drivers cloudbeaver >NUL
 
-echo Generate cloudbeaver.conf file
-call mvn -f ..\apps\config-generator compile exec:java -Dconfig.output="cloudbeaver\conf\cloudbeaver.conf" || goto :error
-
 echo "Build static content"
 
 mkdir .\cloudbeaver\web

deploy/docker/base-java/Dockerfile

@@ -1,5 +1,4 @@
-# Ubuntu 24.04 (Noble Numbat)
-FROM ubuntu:noble
+FROM ubuntu:24.04
 
 MAINTAINER DBeaver Corp, devops@dbeaver.com
 
@@ -9,6 +8,8 @@ RUN set -eux; \
     apt-get update && \
     apt-get dist-upgrade -y --no-install-recommends && \
     apt-get install -y --no-install-recommends \
+        # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
+        curl \
         # java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
         # java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
         # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
@@ -30,7 +31,7 @@ RUN set -eux; \
 ENV LANG=en_US.UTF-8
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:25-jdk-noble $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 RUN set -eux; \

deploy/scripts/launch-product.sh

@@ -13,7 +13,7 @@ if [ "$(id -u)" -eq 0 ]; then
 
     chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
     # Execute run-cloudbeaver-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
-    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh $*"
+    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh"
 else
-    exec ./run-cloudbeaver-server.sh "$@"
-fi
+    exec ./run-cloudbeaver-server.sh
+fi

deploy/scripts/run-cloudbeaver-server.bat

@@ -17,7 +17,6 @@ If Not Defined JAVA_OPTS (
 
 java %JAVA_OPTS% ^
     -Dfile.encoding=UTF-8 ^
-    --enable-native-access=ALL-UNNAMED ^
     --add-modules=ALL-DEFAULT ^
     --add-opens=java.base/java.io=ALL-UNNAMED ^
     --add-opens=java.base/java.lang=ALL-UNNAMED ^
@@ -34,6 +33,7 @@ java %JAVA_OPTS% ^
     --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED  ^
     --add-opens=java.base/sun.nio.ch=ALL-UNNAMED ^
     --add-opens=java.base/sun.security.ssl=ALL-UNNAMED ^
+    --add-opens=java.base/sun.security.action=ALL-UNNAMED ^
     --add-opens=java.base/sun.security.util=ALL-UNNAMED ^
     --add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED ^
     --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED ^

deploy/scripts/run-cloudbeaver-server.sh

@@ -11,7 +11,6 @@ echo "Starting Cloudbeaver Server"
 
 exec java ${JAVA_OPTS} \
   -Dfile.encoding=UTF-8 \
-  --enable-native-access=ALL-UNNAMED \
   --add-modules=ALL-DEFAULT \
   --add-opens=java.base/java.io=ALL-UNNAMED \
   --add-opens=java.base/java.lang=ALL-UNNAMED \
@@ -28,6 +27,7 @@ exec java ${JAVA_OPTS} \
   --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED \
   --add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
   --add-opens=java.base/sun.security.ssl=ALL-UNNAMED \
+  --add-opens=java.base/sun.security.action=ALL-UNNAMED \
   --add-opens=java.base/sun.security.util=ALL-UNNAMED \
   --add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED \
   --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
@@ -35,7 +35,7 @@ exec java ${JAVA_OPTS} \
   --add-opens=java.sql/java.sql=ALL-UNNAMED \
   -jar ${launcherJar} \
   -product io.cloudbeaver.product.ce.product \
-  "$@" \
   -web-config conf/cloudbeaver.conf \
+  "$@" \
   -nl en \
   -registryMultiLanguage

project.deps

@@ -1,2 +1,3 @@
 dbeaver-common
+dbeaver-jdbc-libsql
 dbeaver

server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model.cli;singleton:=true
-Bundle-Version: 1.0.18.qualifier
-Bundle-Release-Date: 20260921
+Bundle-Version: 1.0.7.qualifier
+Bundle-Release-Date: 20260406
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.jkiss.dbeaver.model.cli;visibility:=reexport

server/bundles/io.cloudbeaver.model.cli/pom.xml

@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.model.cli</artifactId>
-    <version>1.0.18-SNAPSHOT</version>
+    <version>1.0.7-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java

@@ -22,11 +22,8 @@ import org.jkiss.dbeaver.model.cli.ApplicationCommandLine;
 import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
 import org.jkiss.dbeaver.model.cli.CLIContextImpl;
 import org.jkiss.dbeaver.model.cli.CLIRunMeta;
-import org.jkiss.dbeaver.model.cli.registry.CLICommandDescriptor;
 import picocli.CommandLine;
 
-import java.util.List;
-
 public class CloudBeaverCommandLine extends ApplicationCommandLine<ApplicationInstanceController> {
     private final CloudBeaverMixin mixin;
 
@@ -56,10 +53,9 @@ public class CloudBeaverCommandLine extends ApplicationCommandLine<ApplicationIn
     protected CommandLine initCommandLine(
         @Nullable ApplicationInstanceController applicationInstanceController,
         @NotNull CLIContextImpl context,
-        @NotNull CLIRunMeta runMeta,
-        @NotNull List<CLICommandDescriptor> commandsToExecute
+        @NotNull CLIRunMeta runMeta
     ) {
-        var cmd = super.initCommandLine(applicationInstanceController, context, runMeta, commandsToExecute);
+        var cmd = super.initCommandLine(applicationInstanceController, context, runMeta);
         cmd.addMixin("cloudbeaver", mixin);
         return cmd;
     }

server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF

@@ -3,20 +3,22 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.109.qualifier
-Bundle-Release-Date: 20260921
+Bundle-Version: 1.0.98.qualifier
+Bundle-Release-Date: 20260406
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
+ org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.model.sm;visibility:=reexport,
  org.jkiss.dbeaver.model.event;visibility:=reexport,
  org.jkiss.dbeaver.model.nio;visibility:=reexport,
  org.jkiss.dbeaver.registry;visibility:=reexport,
- org.jkiss.dbeaver.net.ssh;visibility:=reexport,
+ org.jkiss.dbeaver.net.ssh,
  org.jkiss.bundle.logback;visibility:=reexport,
  org.jkiss.bundle.graphql;visibility:=reexport,
  org.jkiss.bundle.apache.dbcp,
- jakarta.servlet-api;visibility:=reexport
+ com.google.gson;visibility:=reexport,
+ jakarta.servlet-api;bundle-version:="6.0.0";visibility:=reexport
 Export-Package: io.cloudbeaver,
  io.cloudbeaver.auth,
  io.cloudbeaver.auth.provider,
@@ -27,11 +29,6 @@ Export-Package: io.cloudbeaver,
  io.cloudbeaver.websocket.event.client,
  io.cloudbeaver.websocket.event.task,
  io.cloudbeaver.model,
- io.cloudbeaver.model.api.annotation,
- io.cloudbeaver.model.api.annotation.enums,
- io.cloudbeaver.model.api.annotation.media,
- io.cloudbeaver.model.api.annotation.responses,
- io.cloudbeaver.model.api.annotation.tags,
  io.cloudbeaver.model.app,
  io.cloudbeaver.model.config,
  io.cloudbeaver.model.apilog,

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle.properties

@@ -13,7 +13,7 @@ meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductName.
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
 
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Read-only connection
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = Auto-commit mode
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Auto-commit
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Keep-alive interval (seconds)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Default schema
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Default catalog

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_ru.properties

@@ -1,5 +1,5 @@
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Только для чтения
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = Авто-коммит
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Авто-коммит
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Интервал Keep-alive (в секундах)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Схема по умолчанию
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Каталог по умолчанию

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_vi.properties

@@ -1,4 +1,4 @@
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Kết nối chỉ đọc
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = Tự động commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Tự động commit
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Giữ kết nối (tính bằng giây)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Không tự động ngắt kết nối

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_zh.properties

@@ -1,3 +1,3 @@
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = 自动提交
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = 自动提交
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = 保持连接 (秒)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = 无自动断开连接

server/bundles/io.cloudbeaver.model/plugin.xml

@@ -25,11 +25,6 @@
                     label="Default secret controller" description="Default void secret controller"/>
     </extension>
 
-    <extension point="io.cloudbeaver.feature">
-        <feature id="ssh" label="SSH tunnels for databases" description="Enables SSH tunnels for secure database connections, allowing access to remote databases through encrypted channels" enabledByDefault="true"/>
-    </extension>
-
-
     <extension point="org.jkiss.dbeaver.ws.event">
         <event topicId="cb_session_task" id="cb_session_task_info_updated"
                class="io.cloudbeaver.websocket.event.task.WSSessionTaskInfoEvent"/>
@@ -51,8 +46,6 @@
                      class="io.cloudbeaver.websocket.event.client.WSSessionTaskConfirmationEvent"/>
         <clientEvent id="cb_client_session_task_with_parameters_confirmation"
                      class="io.cloudbeaver.websocket.event.client.WSSessionTaskWithParametersConfirmationEvent"/>
-        <clientEvent id="cb_client_cancel_action"
-                     class="io.cloudbeaver.websocket.event.client.WSSessionCancelActionClientEvent"/>
     </extension>
 
 </plugin>

server/bundles/io.cloudbeaver.model/pom.xml

@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.109-SNAPSHOT</version>
+    <version>1.0.98-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import graphql.ErrorClassification;
 import graphql.ErrorType;
 import graphql.GraphQLError;
 import graphql.language.SourceLocation;
-import org.jkiss.dbeaver.DBDatabaseException;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.sql.SQLState;
 import org.jkiss.utils.CommonUtils;
@@ -147,22 +146,19 @@ public class DBWebException extends DBException implements GraphQLError {
             } else {
                 return message;
             }
-        }
-        // Preserve enriched web/database messages, but unwrap generic exceptions to their most specific cause.
-        Throwable messageCause = cause instanceof DBWebException || cause instanceof DBDatabaseException
-            ? cause
-            : CommonUtils.getRootCause(cause);
-        String causeMessage = messageCause.getMessage();
-        if (CommonUtils.isEmpty(causeMessage)) {
-            causeMessage = messageCause.getClass().getSimpleName();
+        } else if (cause.getMessage() == null && cause.getCause() != null) {
+            return message + ":\n" + cause.getCause().getClass().getSimpleName();
         }
         if (CommonUtils.isEmpty(message)) {
-            return causeMessage;
+            if (cause.getMessage() != null) {
+                return cause.getMessage();
+            }
+            return cause.getClass().getName();
         }
-        if (CommonUtils.equalObjects(message, causeMessage)) {
+        if (CommonUtils.equalObjects(message, cause.getMessage())) {
             return message;
         }
-        return message + ":\n" + causeMessage;
+        return message + ":\n" + cause.getMessage();
     }
 
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebConnectionConfigInputHandler.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
-import org.jkiss.dbeaver.registry.DataSourcePreferenceStore;
 import org.jkiss.utils.CommonUtils;
 
 public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C extends DataSourceDescriptor> {
@@ -77,7 +76,9 @@ public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C ex
         }
 
         dataSource.setFolder(input.getFolder() != null ? registry.getFolder(input.getFolder()) : null);
-        dataSource.getConnectionConfiguration().getBootstrap().setDefaultAutoCommit(input.isDefaultAutoCommit());
+        if (input.isDefaultAutoCommit() != null) {
+            dataSource.getConnectionConfiguration().getBootstrap().setDefaultAutoCommit(input.isDefaultAutoCommit());
+        }
         WebDataSourceUtils.setConnectionConfiguration(
             dataSource.getDriver(),
             dataSource.getConnectionConfiguration(),
@@ -92,9 +93,6 @@ public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C ex
             input.isSharedCredentials()
         );
         dataSource.setConnectionReadOnly(input.isReadOnly());
-        DataSourcePreferenceStore preferenceStore = dataSource.getPreferenceStore();
-        preferenceStore.clear();
-        preferenceStore.setProperties(input.getDefaultUserPreferences());
     }
 
     @NotNull

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceConnectEventListener.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package io.cloudbeaver;
 
 import io.cloudbeaver.model.session.WebSession;
-import io.cloudbeaver.utils.WebEventUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPEvent;
@@ -47,7 +46,7 @@ public class WebDataSourceConnectEventListener implements DBPEventListener {
                 new WSDataSourceConnectEvent(
                     container.getProject().getId(),
                     container.getId(),
-                    WebEventUtils.getSmSessionId(webSession),
+                    webSession.getSessionId(),
                     webSession.getUserId()
                 )
             );

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebGlobalProjectRegistryProxy.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
-import org.jkiss.dbeaver.model.net.DBWNetworkProfileManager;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
@@ -259,12 +258,28 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
         dataSourceRegistry.removeSavedFilter(filterName);
     }
 
+    @Nullable
+    @Override
+    public DBWNetworkProfile getNetworkProfile(@Nullable String source, @NotNull String name) {
+        return dataSourceRegistry.getNetworkProfile(source, name);
+    }
+
     @NotNull
     @Override
-    public DBWNetworkProfileManager getNetworkProfiles() {
+    public List<DBWNetworkProfile> getNetworkProfiles() {
         return dataSourceRegistry.getNetworkProfiles();
     }
 
+    @Override
+    public void updateNetworkProfile(@NotNull DBWNetworkProfile profile) {
+        dataSourceRegistry.updateNetworkProfile(profile);
+    }
+
+    @Override
+    public void removeNetworkProfile(@NotNull DBWNetworkProfile profile) {
+        dataSourceRegistry.removeNetworkProfile(profile);
+    }
+
     @Nullable
     @Override
     public DBAAuthProfile getAuthProfile(@NotNull String id) {
@@ -362,12 +377,6 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
         return dataSourceRegistry.getPreferenceStore();
     }
 
-    @Override
-    public void initializeDataSources() {
-        dataSourceRegistry.initializeDataSources();
-    }
-
-    @Nullable
     @Override
     public DataSourceParseResults loadDataSources(
         @NotNull List<DBPDataSourceConfigurationStorage> storages,
@@ -383,7 +392,6 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
         dataSourceRegistry.saveDataSources();
     }
 
-    @NotNull
     @Override
     public DataSourceConfigurationManager getConfigurationManager() {
         return dataSourceRegistry.getConfigurationManager();
@@ -399,12 +407,12 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
     }
 
     @Override
-    public void persistSecrets(@NotNull DBSSecretController secretController) throws DBException {
+    public void persistSecrets(DBSSecretController secretController) throws DBException {
         dataSourceRegistry.persistSecrets(secretController);
     }
 
     @Override
-    public void resolveSecrets(@NotNull DBSSecretController secretController) throws DBException {
+    public void resolveSecrets(DBSSecretController secretController) throws DBException {
         dataSourceRegistry.resolveSecrets(secretController);
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionGlobalProjectImpl.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPEvent;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
-import org.jkiss.dbeaver.model.auth.SMObjectType;
 import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.security.user.SMObjectPermissions;
 
 import java.util.Set;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionProjectImpl.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,11 +29,11 @@ import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPObjectSettingsProvider;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistryCache;
-import org.jkiss.dbeaver.model.auth.SMObjectType;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMUtils;
 import org.jkiss.dbeaver.model.security.SMControllerUtils;
+import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
@@ -103,7 +103,7 @@ public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptabl
         return projectSettings;
     }
 
-    @NotNull
+    @Nullable
     @Override
     public DBNModel getNavigatorModel() {
         return webSession.getNavigatorModel();
@@ -135,11 +135,8 @@ public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptabl
         if (registryIsLoaded) {
             return;
         }
-        DBPDataSourceRegistry dataSourceRegistry = getDataSourceRegistry();
-        // Connection node paths are resolved through the navigator model, so materialize its lazy database branch first.
-        webSession.initializeProjectNavigator(this);
-        dataSourceRegistry.getDataSources().forEach(this::addConnection);
-        Throwable lastError = dataSourceRegistry.getLastError();
+        getDataSourceRegistry().getDataSources().forEach(this::addConnection);
+        Throwable lastError = getDataSourceRegistry().getLastError();
         if (lastError != null) {
             webSession.addSessionError(lastError);
             log.error("Error refreshing connections from project '" + getId() + "'", lastError);
@@ -240,18 +237,6 @@ public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptabl
     public synchronized boolean updateProjectDataSources(@NotNull WSDataSourceEvent event) {
         var sendDataSourceUpdatedEvent = false;
         DBPDataSourceRegistry registry = getDataSourceRegistry();
-        Map<String, DataSourceDescriptor> dataSourceSnapshots = new HashMap<>();
-        if (WSDataSourceEvent.UPDATED.equals(event.getId())) {
-            for (String dsId : event.getDataSourceIds()) {
-                DBPDataSourceContainer dataSource = registry.getDataSource(dsId);
-                if (dataSource instanceof DataSourceDescriptor descriptor) {
-                    DBPDataSourceContainer snapshot = registry.createDataSource(descriptor);
-                    if (snapshot instanceof DataSourceDescriptor snapshotDescriptor) {
-                        dataSourceSnapshots.put(dsId, snapshotDescriptor);
-                    }
-                }
-            }
-        }
         if (WSDataSourceEvent.CREATED.equals(event.getId()) || WSDataSourceEvent.UPDATED.equals(event.getId())) {
             registry.refreshConfig(event.getDataSourceIds());
         }
@@ -266,19 +251,15 @@ public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptabl
                     sendDataSourceUpdatedEvent = true;
                 }
                 case WSDataSourceEvent.UPDATED ->  {
-                    DataSourceDescriptor snapshot = dataSourceSnapshots.get(dsId);
-                    if (snapshot != null && !event.getProperty().hasEffectiveChanges(snapshot, ds)) {
-                        continue;
-                    }
                     if (event.getProperty() == WSDataSourceProperty.CONFIGURATION) {
-                        WebDataSourceUtils.disconnectDataSource(webSession, ds, true);
+                        WebDataSourceUtils.disconnectDataSource(webSession, ds);
                     }
                     if (event.getProperty() != WSDataSourceProperty.INTERNAL) {
                         sendDataSourceUpdatedEvent = true;
                     }
                 }
                 case WSDataSourceEvent.DELETED -> {
-                    WebDataSourceUtils.disconnectDataSource(webSession, ds, false);
+                    WebDataSourceUtils.disconnectDataSource(webSession, ds);
                     if (registry instanceof DBPDataSourceRegistryCache dsrc) {
                         dsrc.removeDataSourceFromList(ds);
                     }
@@ -364,7 +345,7 @@ public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptabl
     @NotNull
     private WebConnectionInfo closeAndDeleteConnection(@NotNull WebConnectionInfo connectionInfo) throws DBWebException {
         DBPDataSourceContainer dataSourceContainer = connectionInfo.getDataSourceContainer();
-        WebDataSourceUtils.disconnectDataSource(webSession, dataSourceContainer, false);
+        WebDataSourceUtils.disconnectDataSource(webSession, dataSourceContainer);
         DBPDataSourceRegistry registry = getDataSourceRegistry();
         registry.removeDataSource(dataSourceContainer);
         removeConnection(dataSourceContainer);
@@ -376,13 +357,6 @@ public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptabl
         return getInputConfigHandler(configInput).createDataSourceContainer();
     }
 
-    public void updateDataSourceContainerFromInput(
-        @NotNull WebConnectionConfig configInput,
-        @NotNull DataSourceDescriptor dataSource
-    ) throws DBWebException {
-        getInputConfigHandler(configInput).updateDataSource(dataSource);
-    }
-
     @NotNull
     public WebConnectionConfig getConnectionConfigInput(@Nullable Map<String, Object> configMap) {
         return new WebConnectionConfig(configMap == null ? Map.of() : configMap);

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderExternal.java

@@ -69,13 +69,6 @@ public interface SMAuthProviderExternal<AUTH_SESSION extends SMSession> extends
         @NotNull WebUser user,
         boolean selfIdentity) throws DBException;
 
-    /**
-     * Whether a user that is not found should be provisioned (auto-created) on external login.
-     */
-    default boolean isAutoUserProvisioningEnabled(@Nullable SMAuthProviderCustomConfiguration providerConfig) {
-        return true;
-    }
-
     /**
      * Make some post authentication actions
      */

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/AutoCommitMode.java

@@ -1,62 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.utils.CommonUtils;
-
-public enum AutoCommitMode {
-    DEFAULT("Default", null),
-    AUTO_COMMIT("Auto commit", true),
-    MANUAL_COMMIT("Manual commit", false);
-
-    private final String title;
-    private final Boolean value;
-
-    AutoCommitMode(@NotNull String title, @Nullable Boolean value) {
-        this.title = title;
-        this.value = value;
-    }
-
-    @NotNull
-    @Override
-    public String toString() {
-        return title;
-    }
-
-    @Nullable
-    public Boolean getValue() {
-        return value;
-    }
-
-    @NotNull
-    public static AutoCommitMode fromValue(@Nullable Boolean value) {
-        if (value == null) {
-            return DEFAULT;
-        }
-        return value ? AUTO_COMMIT : MANUAL_COMMIT;
-    }
-
-    @Nullable
-    public static Boolean from(@Nullable String mode) {
-        if (CommonUtils.isEmpty(mode)) {
-            return null;
-        }
-        return valueOf(mode).getValue();
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionConfig.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.meta.Property;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -65,9 +64,6 @@ public class WebConnectionConfig {
     private Boolean defaultAutoCommit;
     private String defaultCatalogName;
     private String defaultSchemaName;
-    private String connectionType;
-    @NotNull
-    private Map<String, String> defaultUserPreferences = new LinkedHashMap<>();
 
     public WebConnectionConfig() {
     }
@@ -103,14 +99,8 @@ public class WebConnectionConfig {
             expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_KEEP_ALIVE_INTERVAL, -1);
         readOnly = JSONUtils.getBoolean(
             expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_READ_ONLY);
-
-        if (expertSettingsValues != null) {
-            defaultAutoCommit = AutoCommitMode.from(
-                JSONUtils.getString(expertSettingsValues, WebExpertSettingsProperties.PROP_AUTO_COMMIT_MODE));
-        } else {
-            defaultAutoCommit = JSONUtils.getBoolean(params, WebExpertSettingsProperties.PROP_AUTO_COMMIT, true);
-        }
-
+        defaultAutoCommit = JSONUtils.getBoolean(
+            expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_AUTO_COMMIT, true);
         defaultCatalogName = JSONUtils.getString(
             expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_DEFAULT_CATALOG);
         defaultSchemaName = JSONUtils.getString(
@@ -121,13 +111,10 @@ public class WebConnectionConfig {
         String configType = JSONUtils.getString(params, "configurationType");
         configurationType = configType == null ? null : DBPDriverConfigurationType.valueOf(configType);
 
-        Map<String, Object> stringObjectUserPrefMap = JSONUtils.getObject(params, "defaultUserPreferences");
-        stringObjectUserPrefMap.forEach((key, value) -> defaultUserPreferences.put(key, value.toString()));
         networkHandlersConfig = new ArrayList<>();
         for (Map<String, Object> nhc : JSONUtils.getObjectList(params, "networkHandlersConfig")) {
             networkHandlersConfig.add(new WebNetworkHandlerConfigInput(nhc));
         }
-        connectionType = JSONUtils.getString(params, "connectionType");
     }
 
     @Property
@@ -380,22 +367,4 @@ public class WebConnectionConfig {
     public void setDefaultSchemaName(String defaultSchemaName) {
         this.defaultSchemaName = defaultSchemaName;
     }
-
-    @NotNull
-    public Map<String, String> getDefaultUserPreferences() {
-        return defaultUserPreferences;
-    }
-
-    public void setDefaultUserPreferences(@NotNull Map<String, String> defaultUserPreferences) {
-        this.defaultUserPreferences = defaultUserPreferences;
-    }
-
-    @Nullable
-    public String getConnectionType() {
-        return connectionType;
-    }
-
-    public void setConnectionType(@Nullable String connectionType) {
-        this.connectionType = connectionType;
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java

@@ -39,15 +39,12 @@ import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
 import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNative;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
-import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
-import org.jkiss.dbeaver.model.navigator.DBNUtils;
-import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
+import org.jkiss.dbeaver.model.navigator.DBNDataSource;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
 import org.jkiss.dbeaver.model.rm.RMConstants;
 import org.jkiss.dbeaver.model.rm.RMProjectPermission;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableParametrized;
-import org.jkiss.dbeaver.registry.DataSourcePreferenceStore;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -72,11 +69,6 @@ public class WebConnectionInfo {
     private static final String FEATURE_PROVIDED = "provided";
     private static final String FEATURE_MANAGEABLE = "manageable";
 
-    private static final String FEATURE_RESTRICT_DATA_EDIT = "restrictDataEdit";
-    private static final String FEATURE_RESTRICT_SCRIPT_EXECUTE = "restrictScriptExecute";
-    private static final String FEATURE_RESTRICT_DATA_IMPORT = "restrictDataImport";
-    private static final String FEATURE_RESTRICT_METADATA_EDIT = "restrictMetadataEdit";
-
     private static final String TOOL_SESSION_MANAGER = "sessionManager";
     
     private final WebSession session;
@@ -219,8 +211,7 @@ public class WebConnectionInfo {
 
     @Property
     public String getNodePath() {
-        DBNDatabaseNode dsNode = DBNUtils.getNodeByObject(dataSourceContainer);
-        return dsNode == null ? null : dsNode.getNodeUri();
+        return DBNDataSource.makeDataSourceItemPath(dataSourceContainer);
     }
 
     @Property
@@ -280,18 +271,6 @@ public class WebConnectionInfo {
         if (dataSourceContainer.isConnectionReadOnly()) {
             features.add(FEATURE_READ_ONLY);
         }
-        if (!dataSourceContainer.hasModifyPermission(DBPDataSourcePermission.PERMISSION_EDIT_DATA)) {
-            features.add(FEATURE_RESTRICT_DATA_EDIT);
-        }
-        if (!dataSourceContainer.hasModifyPermission(DBPDataSourcePermission.PERMISSION_EXECUTE_SCRIPTS)) {
-            features.add(FEATURE_RESTRICT_SCRIPT_EXECUTE);
-        }
-        if (!dataSourceContainer.hasModifyPermission(DBPDataSourcePermission.PERMISSION_IMPORT_DATA)) {
-            features.add(FEATURE_RESTRICT_DATA_IMPORT);
-        }
-        if (!dataSourceContainer.hasModifyPermission(DBPDataSourcePermission.PERMISSION_EDIT_METADATA)) {
-            features.add(FEATURE_RESTRICT_METADATA_EDIT);
-        }
         if (dataSourceContainer.isProvided()) {
             features.add(FEATURE_PROVIDED);
         }
@@ -314,16 +293,6 @@ public class WebConnectionInfo {
         return dataSourceContainer.getNavigatorSettings().getOriginalSettings();
     }
 
-    @Property
-    @NotNull
-    public Map<String, String> getDefaultUserPreferences() {
-        DBPPreferenceStore preferenceStore = dataSourceContainer.getPreferenceStore();
-        if (preferenceStore instanceof DataSourcePreferenceStore dataSourcePreferenceStore) {
-            return dataSourcePreferenceStore.getProperties();
-        }
-        return Collections.emptyMap();
-    }
-
     @Property
     @NotNull
     public List<WebDataFormat> getSupportedDataFormats() {
@@ -484,7 +453,7 @@ public class WebConnectionInfo {
     @Property
     public Map<String, Object> getExpertSettingsValues() {
         Map<String, Object> expertSettings = new LinkedHashMap<>();
-        expertSettings.put(WebExpertSettingsProperties.PROP_AUTO_COMMIT_MODE, AutoCommitMode.fromValue(isAutocommit()));
+        expertSettings.put(WebExpertSettingsProperties.PROP_AUTO_COMMIT, isAutocommit());
         expertSettings.put(WebExpertSettingsProperties.PROP_KEEP_ALIVE_INTERVAL, getKeepAliveInterval());
         expertSettings.put(WebExpertSettingsProperties.PROP_READ_ONLY, isReadOnly());
         expertSettings.put(WebExpertSettingsProperties.PROP_DEFAULT_CATALOG, getDefaultCatalogName());
@@ -558,9 +527,12 @@ public class WebConnectionInfo {
     }
 
     @Property
-    @Nullable
-    public Boolean isAutocommit() {
-        return dataSourceContainer.getConnectionConfiguration().getBootstrap().getDefaultAutoCommit();
+    public boolean isAutocommit() {
+        Boolean isAutoCommit = dataSourceContainer.getConnectionConfiguration().getBootstrap().getDefaultAutoCommit();
+        if (isAutoCommit == null) {
+            return true;
+        }
+        return isAutoCommit;
     }
 
     @Property
@@ -600,25 +572,10 @@ public class WebConnectionInfo {
         return tools;
     }
 
-    @NotNull
-    public String getConnectionType() {
-        return dataSourceContainer.getConnectionConfiguration().getConnectionType().getId();
-    }
-
     /**
      * Updates param that checks whether credentials were saved only in session.
      */
     public void setCredentialsSavedInSession(@Nullable Boolean credentialsSavedInSession) {
         this.credentialsSavedInSession = credentialsSavedInSession;
     }
-
-    /**
-     * Database-dependent driver configuration used to drive data import
-     */
-    @Property
-    @NotNull
-    public WebDriverConfiguration getDriverConfiguration() {
-        return new WebDriverConfiguration(dataSourceContainer);
-    }
-
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebDictionaryValueInfo.java

@@ -1,58 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.meta.Property;
-
-/**
- * Generic id/name/description dictionary value.
- */
-public class WebDictionaryValueInfo {
-
-    @NotNull
-    private final String id;
-    @NotNull
-    private final String name;
-    @Nullable
-    private final String description;
-
-    public WebDictionaryValueInfo(@NotNull String id, @NotNull String name, @Nullable String description) {
-        this.id = id;
-        this.name = name;
-        this.description = description;
-    }
-
-    @Property
-    @NotNull
-    public String getId() {
-        return id;
-    }
-
-    @Property
-    @NotNull
-    public String getName() {
-        return name;
-    }
-
-    @Property
-    @Nullable
-    public String getDescription() {
-        return description;
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebDriverConfiguration.java

@@ -1,75 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.model.DBPDataSource;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.DBUtils;
-import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.dbeaver.model.sql.SQLDialectInsertReplaceMethod;
-import org.jkiss.dbeaver.model.sql.SQLDialectMetadata;
-import org.jkiss.dbeaver.model.struct.DBSDataBulkLoader;
-import org.jkiss.utils.CommonUtils;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class WebDriverConfiguration {
-
-    @NotNull
-    private final DBPDataSourceContainer dataSourceContainer;
-
-    public WebDriverConfiguration(@NotNull DBPDataSourceContainer dataSourceContainer) {
-        this.dataSourceContainer = dataSourceContainer;
-    }
-
-    /**
-     * 'On duplicate key' replace methods supported by this connection's SQL dialect
-     */
-    @Property
-    @NotNull
-    public List<WebDictionaryValueInfo> getSupportedInsertReplaceMethods() {
-        SQLDialectMetadata dialect = dataSourceContainer.getDriver().getScriptDialect();
-        List<SQLDialectInsertReplaceMethod> replaceMethods = dialect.getSupportedInsertReplaceMethodsDescriptors();
-        if (CommonUtils.isEmpty(replaceMethods)) {
-            return Collections.emptyList();
-        }
-        return replaceMethods.stream()
-            .map(method -> new WebDictionaryValueInfo(method.getId(), method.getLabel(), method.getDescription()))
-            .collect(Collectors.toList());
-    }
-
-    /**
-     * Whether the connection's database supports bulk load during data import
-     */
-    @Property
-    public boolean isSupportsBulkLoad() {
-        DBPDataSource dataSource = dataSourceContainer.getDataSource();
-        return dataSource != null && DBUtils.getAdapter(DBSDataBulkLoader.class, dataSource) != null;
-    }
-
-    /**
-     * Whether the connection's database supports transaction
-     */
-    @Property
-    public boolean isSupportsTransactions() {
-        DBPDataSource dataSource = dataSourceContainer.getDataSource();
-        return dataSource != null && dataSource.getInfo().supportsTransactions();
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebExpertSettingsProperties.java

@@ -1,19 +1,3 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package io.cloudbeaver.model;
 
 import org.jkiss.code.NotNull;
@@ -21,7 +5,6 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.DBPObject;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.connection.DBPDriverConstants;
-import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider;
 import org.jkiss.dbeaver.model.meta.IPropertyValueValidator;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.utils.CommonUtils;
@@ -32,7 +15,6 @@ import org.jkiss.utils.CommonUtils;
 public class WebExpertSettingsProperties implements DBPObject {
     public static final String PROP_READ_ONLY = "readOnly";
     public static final String PROP_AUTO_COMMIT = "autocommit";
-    public static final String PROP_AUTO_COMMIT_MODE = "autoCommitMode";
     public static final String PROP_KEEP_ALIVE_INTERVAL = "keepAliveInterval";
     public static final String PROP_DEFAULT_CATALOG = "defaultCatalogName";
     public static final String PROP_DEFAULT_SCHEMA = "defaultSchemaName";
@@ -48,15 +30,9 @@ public class WebExpertSettingsProperties implements DBPObject {
         return 0;
     }
 
-    @NotNull
-    @Property(
-        order = 2,
-        id = PROP_AUTO_COMMIT_MODE,
-        visibleIf = AutoCommitFieldValidator.class,
-        listProvider = AutoCommitListProvider.class
-    )
-    public AutoCommitMode isAutoCommitMode() {
-        return AutoCommitMode.DEFAULT;
+    @Property(order = 2, id = PROP_AUTO_COMMIT, visibleIf = AutoCommitFieldValidator.class)
+    public boolean isAutoCommit() {
+        return true;
     }
 
     @Property(order = 3, id = PROP_READ_ONLY, visibleIf = ReadOnlyFieldValidator.class)
@@ -64,13 +40,11 @@ public class WebExpertSettingsProperties implements DBPObject {
         return false;
     }
 
-    @Nullable
     @Property(order = 4, id = PROP_DEFAULT_CATALOG, visibleIf = DefaultCatalogFieldVisibleValidator.class)
     public String getDefaultCatalog() {
         return null;
     }
 
-    @Nullable
     @Property(order = 5, id = PROP_DEFAULT_SCHEMA, visibleIf = DefaultSchemaFieldVisibleValidator.class)
     public String getDefaultSchema() {
         return null;
@@ -111,18 +85,4 @@ public class WebExpertSettingsProperties implements DBPObject {
             return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_SCHEMA_SELECTION), true);
         }
     }
-
-    public static class AutoCommitListProvider implements IPropertyValueListProvider<WebExpertSettingsProperties> {
-
-        @Override
-        public boolean allowCustomValue() {
-            return false;
-        }
-
-        @Nullable
-        @Override
-        public Object[] getPossibleValues(@Nullable WebExpertSettingsProperties object) {
-            return AutoCommitMode.values();
-        }
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebNetworkHandlerConfigInput.java

@@ -16,8 +16,6 @@
  */
 package io.cloudbeaver.model;
 
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.net.DBWHandlerType;
 import org.jkiss.utils.CommonUtils;
@@ -30,14 +28,12 @@ import java.util.Map;
  */
 public class WebNetworkHandlerConfigInput {
 
-    @NotNull
     private final Map<String, Object> cfg;
 
-    public WebNetworkHandlerConfigInput(@NotNull Map<String, Object> cfg) {
+    public WebNetworkHandlerConfigInput(Map<String, Object> cfg) {
         this.cfg = cfg;
     }
 
-    @Nullable
     public DBWHandlerType getType() {
         return CommonUtils.valueOf(DBWHandlerType.class, JSONUtils.getString(cfg, "type"), null);
     }
@@ -46,7 +42,6 @@ public class WebNetworkHandlerConfigInput {
         return JSONUtils.getString(cfg, "id");
     }
 
-    @Nullable
     public Boolean isEnabled() {
         if (cfg.containsKey("enabled")) {
             return JSONUtils.getBoolean(cfg, "enabled");
@@ -67,13 +62,11 @@ public class WebNetworkHandlerConfigInput {
         return JSONUtils.getString(cfg, "password");
     }
 
-    // Deprecated. Use secured properties
-    @Nullable
+    @Deprecated // use secured properties
     public String getKey() {
         return JSONUtils.getString(cfg, "key");
     }
 
-    @Nullable
     public Boolean isSavePassword() {
         if (cfg.containsKey("savePassword")) {
             return JSONUtils.getBoolean(cfg, "savePassword");
@@ -82,12 +75,10 @@ public class WebNetworkHandlerConfigInput {
         }
     }
 
-    @Nullable
     public Map<String, Object> getProperties() {
         return JSONUtils.getObjectOrNull(cfg, "properties");
     }
 
-    @Nullable
     public Map<String, String> getSecureProperties() {
         var secureProperties = JSONUtils.getObjectOrNull(cfg, "secureProperties");
         if (secureProperties == null) {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebPropertyInfo.java

@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.impl.PropertyDescriptor;
 import org.jkiss.dbeaver.model.impl.ProviderPropertyDescriptor;
 import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider;
 import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.dbeaver.model.meta.PropertyConstraints;
 import org.jkiss.dbeaver.model.meta.PropertyLength;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
@@ -43,58 +42,63 @@ import java.util.*;
  * Web connection info
  */
 public class WebPropertyInfo {
-    @NotNull
-    private final WebSession session;
-    @NotNull
-    private final DBPPropertyDescriptor property;
-    @Nullable
-    private final DBPPropertySource propertySource;
+    private WebSession session;
+    private DBPPropertyDescriptor property;
+    private DBPPropertySource propertySource;
+    private boolean showProtected;
 
-    public WebPropertyInfo(
-        @NotNull WebSession session,
-        @NotNull DBPPropertyDescriptor property,
-        @Nullable DBPPropertySource propertySource
-    ) {
+    private Object[] validValues;
+
+    private String[] supportedConfigurationTypes = new String[0];
+
+    private Object defaultValue;
+
+    public WebPropertyInfo(WebSession session, DBPPropertyDescriptor property, DBPPropertySource propertySource) {
         this.session = session;
         this.property = property;
         this.propertySource = propertySource;
     }
 
-    public WebPropertyInfo(@NotNull WebSession session, @NotNull DBPPropertyDescriptor property) {
-        this(session, property, null);
+    public WebPropertyInfo(WebSession session, DBPPropertyDescriptor property) {
+        this.session = session;
+        this.property = property;
+    }
+
+    public boolean isShowProtected() {
+        return showProtected;
+    }
+
+    public void setShowProtected(boolean showProtected) {
+        this.showProtected = showProtected;
     }
 
     ///////////////////////////////////
     // General properties
     ///////////////////////////////////
 
-    @NotNull
     @Property
     public String getId() {
         return CommonUtils.toString(property.getId());
     }
 
-    @NotNull
     @Property
     public String getDisplayName() {
-        if (property instanceof DBPNamedObjectLocalized localized) {
-            return localized.getLocalizedName(session.getLocale());
+        if (property instanceof DBPNamedObjectLocalized) {
+            return ((DBPNamedObjectLocalized) property).getLocalizedName(session.getLocale());
         } else {
             return property.getDisplayName();
         }
     }
 
-    @Nullable
     @Property
     public String getDescription() {
-        if (property instanceof DBPObjectWithDescriptionLocalized localized) {
-            return localized.getLocalizedDescription(session.getLocale());
+        if (property instanceof DBPObjectWithDescriptionLocalized) {
+            return ((DBPObjectWithDescriptionLocalized) property).getLocalizedDescription(session.getLocale());
         } else {
             return property.getDescription();
         }
     }
 
-    @Nullable
     @Property
     public String getHint() {
         return property.getHint();
@@ -105,53 +109,38 @@ public class WebPropertyInfo {
         return property instanceof ObjectPropertyDescriptor ? ((ObjectPropertyDescriptor) property).getOrderNumber() : -1;
     }
 
-    @Nullable
     @Property
     public String getCategory() {
         return property.getCategory();
     }
 
-    @Nullable
     @Property
     public String getType() {
         return getDataType();
     }
 
-    @Nullable
     @Property
     public String getDataType() {
         Class<?> dataType = property.getDataType();
         return dataType == null ? null : dataType.getSimpleName();
     }
 
-    @NotNull
     @Property
     public PropertyLength getLength() {
         return property.getLength();
     }
 
-    @Nullable
     @Property
     public Object getDefaultValue() throws DBException {
-        Object defaultValue = property.getDefaultValue();
-        if (property instanceof ObjectPropertyDescriptor && defaultValue == null) {
-            return getValue();
-        }
-        return defaultValue;
+        var defaultValue = property.getDefaultValue() == null ? this.defaultValue : property.getDefaultValue();
+        return defaultValue == null ? getValue() : defaultValue;
     }
 
-    @Nullable
-    @Property
-    public PropertyConstraints getConstraints() {
-        return property instanceof ObjectPropertyDescriptor descriptor ? descriptor.getConstraints() : null;
-    }
-
-    @Nullable
     @Property
     public Object getValue() throws DBException {
         Object value = propertySource == null ? null : propertySource.getPropertyValue(session.getProgressMonitor(), property.getId());
         if (property instanceof ObjectPropertyDescriptor opd &&
-            (opd.isPassword() || opd.isHidden())
+            (!showProtected && opd.isPassword() || opd.isHidden())
         ) {
             return maskValue(value);
         } else if (property instanceof PropertyDescriptor pd) {
@@ -163,7 +152,6 @@ public class WebPropertyInfo {
         return value == null ? null : makePropertyValue(value);
     }
 
-    @Nullable
     @Property
     public Object[] getValidValues() {
         if (property instanceof IPropertyValueListProvider) {
@@ -176,18 +164,17 @@ public class WebPropertyInfo {
                 }
                 return validValues;
             }
+            return validValues;
         }
-        return null;
+        return validValues;
     }
 
-    @NotNull
     @Property
     public String[] getFeatures() {
         String[] features = property.getFeatures();
         return features == null ? new String[0] : features;
     }
 
-    @NotNull
     @Property
     public String[] getSupportedConfigurationTypes() {
         if (property instanceof ProviderPropertyDescriptor) {
@@ -195,7 +182,7 @@ public class WebPropertyInfo {
                 .map(DBPDriverConfigurationType::toString)
                 .toArray(String[]::new);
         }
-        return new String[0];
+        return supportedConfigurationTypes;
     }
 
     @Property
@@ -216,14 +203,12 @@ public class WebPropertyInfo {
         return false;
     }
 
-    @NotNull
     @Override
     public String toString() {
         return CommonUtils.toString(property.getId());
     }
 
-    @Nullable
-    private Object makePropertyValue(@Nullable Object value) {
+    private Object makePropertyValue(Object value) {
         if (value == null) {
             return null;
 //        } else if (value instanceof DBSObject) {
@@ -305,6 +290,21 @@ public class WebPropertyInfo {
         return conditions;
     }
 
+
+    //TODO: delete after refactoring on front-end
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+    //TODO: delete after refactoring on front-end
+    public void setValidValues(Object[] validValues) {
+        this.validValues = validValues;
+    }
+
+    //TODO: delete after refactoring on front-end
+    public void setSupportedConfigurationTypes(String[] supportedConfigurationTypes) {
+        this.supportedConfigurationTypes = supportedConfigurationTypes;
+    }
+
     public record Condition(@NotNull String expression, @NotNull Type conditionType) {
         public enum Type {
             HIDE,

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/Operation.java

@@ -1,41 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation;
-
-import io.cloudbeaver.model.api.annotation.responses.ApiResponse;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Operation {
-
-	String summary() default "";
-
-	String description() default "";
-
-	String operationId() default "";
-
-	String method() default "";
-
-	Parameter[] parameters() default {};
-
-	ApiResponse[] responses() default {};
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/Parameter.java

@@ -1,51 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation;
-
-import io.cloudbeaver.model.api.annotation.enums.Explode;
-import io.cloudbeaver.model.api.annotation.enums.ParameterIn;
-import io.cloudbeaver.model.api.annotation.enums.ParameterStyle;
-import io.cloudbeaver.model.api.annotation.media.ArraySchema;
-import io.cloudbeaver.model.api.annotation.media.Schema;
-
-import java.lang.annotation.*;
-
-@Repeatable(Parameters.class)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
-public @interface Parameter {
-
-	String name() default "";
-
-	String description() default "";
-
-	boolean required() default false;
-
-	String example() default "";
-
-	ParameterIn in() default ParameterIn.DEFAULT;
-
-	Schema schema() default @Schema;
-
-	ArraySchema array() default @ArraySchema;
-
-	ParameterStyle style() default ParameterStyle.DEFAULT;
-
-	Explode explode() default Explode.DEFAULT;
-
-	boolean hidden() default false;
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/Parameters.java

@@ -1,29 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
-public @interface Parameters {
-
-	Parameter[] value();
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/enums/Explode.java

@@ -1,34 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.enums;
-
-public enum Explode {
-	TRUE("true"),
-	FALSE("false"),
-	DEFAULT("default");
-
-	private final String value;
-
-	Explode(final String value) {
-		this.value = value;
-	}
-
-	@Override
-	public String toString() {
-		return value;
-	}
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/enums/ParameterIn.java

@@ -1,36 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.enums;
-
-public enum ParameterIn {
-	DEFAULT("default"),
-	QUERY("query"),
-	HEADER("header"),
-	PATH("path"),
-	COOKIE("cookie");
-
-	private final String value;
-
-	ParameterIn(final String value) {
-		this.value = value;
-	}
-
-	@Override
-	public String toString() {
-		return value;
-	}
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/enums/ParameterStyle.java

@@ -1,39 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.enums;
-
-public enum ParameterStyle {
-	MATRIX("matrix"),
-	LABEL("label"),
-	FORM("form"),
-	SIMPLE("simple"),
-	SPACEDELIMITED("spaceDelimited"),
-	PIPEDELIMITED("pipeDelimited"),
-	DEEPOBJECT("deepObject"),
-	DEFAULT("default");
-
-	private final String value;
-
-	ParameterStyle(final String value) {
-		this.value = value;
-	}
-
-	@Override
-	public String toString() {
-		return value;
-	}
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/media/ArraySchema.java

@@ -1,29 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.media;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-public @interface ArraySchema {
-
-	Schema schema() default @Schema;
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/media/Content.java

@@ -1,29 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.media;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-public @interface Content {
-
-	Schema schema() default @Schema;
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/media/Schema.java

@@ -1,37 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.media;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-public @interface Schema {
-
-	String description() default "";
-
-	String example() default "";
-
-	String type() default "";
-
-	Class<?> implementation() default Void.class;
-
-	boolean required() default false;
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/responses/ApiResponse.java

@@ -1,35 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.responses;
-
-import io.cloudbeaver.model.api.annotation.media.Content;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-public @interface ApiResponse {
-
-	String responseCode() default "default";
-
-	String description() default "";
-
-	Content[] content() default {};
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/tags/Tag.java

@@ -1,31 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.api.annotation.tags;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Tag {
-
-	String name() default "";
-
-	String description() default "";
-}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,18 +25,16 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBFileController;
-import org.jkiss.dbeaver.model.app.DBPLockManagerProvider;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
-import org.jkiss.dbeaver.model.fs.lock.LockManager;
-import org.jkiss.dbeaver.model.fs.lock.shared.SharedFileLockManager;
 import org.jkiss.dbeaver.model.impl.app.ApplicationRegistry;
 import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
 import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
+import org.jkiss.dbeaver.model.websocket.event.WSEventController;
 import org.jkiss.dbeaver.runtime.IVariableResolver;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
@@ -50,7 +48,7 @@ import java.util.Map;
 /**
  * Servlet application
  */
-public abstract class BaseServletApplication extends BaseApplicationImpl implements ServletApplication, DBPLockManagerProvider {
+public abstract class BaseServletApplication extends BaseApplicationImpl implements ServletApplication {
 
     public static final String DEFAULT_CONFIG_FILE_PATH = "/etc/cloudbeaver.conf";
     public static final String CUSTOM_CONFIG_FOLDER = "custom";
@@ -61,7 +59,6 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
 
     private String instanceId;
 
-    @NotNull
     @Override
     public RMController createResourceController(
         @NotNull SMCredentialsProvider credentialsProvider,
@@ -76,16 +73,10 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
         throw new IllegalStateException("File controller is not supported by " + getClass().getSimpleName());
     }
 
-    @NotNull
+    @Nullable
     @Override
-    public LockManager createLockManager(@NotNull String applicationId, @NotNull Path metadataFolder) throws DBException {
-        return new SharedFileLockManager(applicationId, metadataFolder);
-    }
-
-    @NotNull
-    @Override
-    public LockManager createLockManager() throws DBException {
-        return new SharedFileLockManager(getApplicationInstanceId());
+    public Path getDefaultWorkingFolder() {
+        return getServerConfigurationController().getWorkspacePath();
     }
 
     @Override
@@ -185,20 +176,20 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
 
     @SuppressWarnings("unchecked")
     public static void patchConfigurationWithProperties(
-        @NotNull Map<String, Object> configProps,
-        @NotNull IVariableResolver varResolver
+        Map<String, Object> configProps, IVariableResolver varResolver
     ) {
         for (Map.Entry<String, Object> entry : configProps.entrySet()) {
             Object propValue = entry.getValue();
-            if (propValue instanceof String strValue) {
-                entry.setValue(GeneralUtils.replaceVariables(strValue, varResolver));
+            if (propValue instanceof String) {
+                entry.setValue(GeneralUtils.replaceVariables((String) propValue, varResolver));
             } else if (propValue instanceof Map) {
                 patchConfigurationWithProperties((Map<String, Object>) propValue, varResolver);
-            } else if (propValue instanceof List value) {
+            } else if (propValue instanceof List) {
+                List value = (List) propValue;
                 for (int i = 0; i < value.size(); i++) {
                     Object colItem = value.get(i);
-                    if (colItem instanceof String strItem) {
-                        value.set(i, GeneralUtils.replaceVariables(strItem, varResolver));
+                    if (colItem instanceof String) {
+                        value.set(i, GeneralUtils.replaceVariables((String) colItem, varResolver));
                     } else if (colItem instanceof Map) {
                         patchConfigurationWithProperties((Map<String, Object>) colItem, varResolver);
                     }
@@ -211,8 +202,6 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
     @Override
     public Object start(IApplicationContext context) {
         initializeApplicationServices();
-        setWorkspacePath(getServerConfigurationController().getWorkspacePath());
-
         try {
             startServer();
         } catch (Exception e) {
@@ -250,17 +239,27 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
     }
 
     @NotNull
+    @Override
+    public Path getWorkspaceDirectory() {
+        return getServerConfigurationController().getWorkspacePath();
+    }
+
+
     public String getApplicationId() {
         try {
             return getApplicationInstanceId();
         } catch (DBException e) {
-            // Fallback to hash code
-            return getClass().getSimpleName() + "#" + hashCode();
+            return null;
         }
     }
 
     @NotNull
-    public abstract ServletServerConfigurationController<?> getServerConfigurationController();
+    @Override
+    public WSEventController getEventController() {
+        return null;
+    }
+
+    public abstract ServletServerConfigurationController getServerConfigurationController();
 
     @Override
     public boolean isEnvironmentVariablesAccessible() {

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,9 @@ public interface ServletApplication extends DBPApplication {
     @NotNull
     Path getDataDirectory(boolean create);
 
+    @NotNull
+    Path getWorkspaceDirectory();
+
     @NotNull
     Path getHomeDirectory();
 

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 
 public interface ServletAuthApplication extends ServletApplication {
-    @NotNull
     ServletAuthConfiguration getAuthConfiguration();
 
     @Nullable

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java

@@ -115,6 +115,13 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
         return ((DBNResourceManagerRoot) getParentNode()).getResourceController();
     }
 
+    @NotNull
+    @Deprecated
+    @Override
+    public String getNodeItemPath() {
+        return getParentNode().getNodeItemPath() + "/" + getName();
+    }
+
     @Nullable
     @Override
     public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java

@@ -160,6 +160,13 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
         throw new DBException("Can't detect resource root node");
     }
 
+    @NotNull
+    @Deprecated
+    @Override
+    public String getNodeItemPath() {
+        return getParentNode().getNodeItemPath() + "/" + getNodeDisplayName();
+    }
+
     @Nullable
     @Override
     public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java

@@ -115,6 +115,14 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return projects;
     }
 
+    @NotNull
+    @Deprecated
+    @Override
+    public String getNodeItemPath() {
+        // Path doesn't include project name
+        return NodePathType.ext.getPrefix() + getNodeDisplayName();
+    }
+
     @Nullable
     @Override
     public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/BaseLocalResourceController.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,7 @@ import org.jkiss.dbeaver.model.DBPDataSourceFolder;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
-import org.jkiss.dbeaver.model.fs.lock.LockManager;
-import org.jkiss.dbeaver.model.fs.lock.LockOptions;
-import org.jkiss.dbeaver.model.fs.lock.LockTarget;
+import org.jkiss.dbeaver.model.fs.lock.FileLockController;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMEvent;
 import org.jkiss.dbeaver.model.rm.RMEventManager;
@@ -55,11 +53,11 @@ public abstract class BaseLocalResourceController implements RMController {
     @NotNull
     protected final DBPWorkspace workspace;
     @NotNull
-    protected final LockManager lockController;
+    protected final FileLockController lockController;
 
     protected BaseLocalResourceController(
         @NotNull DBPWorkspace workspace,
-        @NotNull LockManager lockController
+        @NotNull FileLockController lockController
     ) {
         this.workspace = workspace;
         this.lockController = lockController;
@@ -67,7 +65,8 @@ public abstract class BaseLocalResourceController implements RMController {
 
     @Nullable
     @Override
-    public RMProject getProject(@NotNull String projectId, boolean readResources, boolean readProperties) throws DBException {
+    public RMProject getProject(@NotNull String projectId, boolean readResources, boolean readProperties)
+        throws DBException {
         RMProject project = makeProjectFromId(projectId, true);
         if (project == null) {
             return null;
@@ -109,7 +108,8 @@ public abstract class BaseLocalResourceController implements RMController {
     }
 
     @Override
-    public String getProjectsDataSources(@NotNull String projectId, @Nullable String[] dataSourceIds) throws DBException {
+    public String getProjectsDataSources(@NotNull String projectId, @Nullable String[] dataSourceIds)
+        throws DBException {
         DBPProject projectMetadata = getWebProject(projectId, false);
         return doFileReadOperation(
             projectId,
@@ -157,7 +157,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String configuration,
         @Nullable List<String> dataSourceIds
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("updateProjectDataSources"))) {
+        try (var ignoredLock = lockController.lock(projectId, "updateProjectDataSources")) {
             DBPProject project = getWebProject(projectId, false);
             return doFileWriteOperation(
                 projectId, project.getMetadataFolder(false),
@@ -188,7 +188,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String projectId,
         @NotNull String[] dataSourceIds
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("deleteDataSources"))) {
+        try (var ignoredLock = lockController.lock(projectId, "deleteDataSources")) {
             DBPProject project = getWebProject(projectId, false);
             doFileWriteOperation(projectId, project.getMetadataFolder(false), () -> {
                 DBPDataSourceRegistry registry = project.getDataSourceRegistry();
@@ -213,7 +213,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String projectId,
         @NotNull String folderPath
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createDatasourceFolder"))) {
+        try (var ignoredLock = lockController.lock(projectId, "createDatasourceFolder")) {
             DBPProject project = getWebProject(projectId, false);
             log.debug("Creating data source folder '" + folderPath + "' in project '" + projectId + "'");
             doFileWriteOperation(projectId, project.getMetadataFolder(false),
@@ -241,7 +241,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String[] folderPaths,
         boolean dropContents
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createDatasourceFolder"))) {
+        try (var ignoredLock = lockController.lock(projectId, "createDatasourceFolder")) {
             DBPProject project = getWebProject(projectId, false);
             doFileWriteOperation(projectId, project.getMetadataFolder(false),
                 () -> {
@@ -267,7 +267,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String oldPath,
         @NotNull String newPath
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createDatasourceFolder"))) {
+        try (var ignoredLock = lockController.lock(projectId, "createDatasourceFolder")) {
             DBPProject project = getWebProject(projectId, false);
             log.debug("Moving data source folder from '" + oldPath + "' to '" + newPath + "' in project '" + projectId + "'");
             doFileWriteOperation(projectId, project.getMetadataFolder(false),

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,29 +33,24 @@ import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentials;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
-import org.jkiss.dbeaver.model.auth.SMObjectType;
-import org.jkiss.dbeaver.model.fs.lock.LockManager;
-import org.jkiss.dbeaver.model.fs.lock.LockOptions;
-import org.jkiss.dbeaver.model.fs.lock.LockTarget;
+import org.jkiss.dbeaver.model.fs.lock.FileLockController;
 import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
 import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.navigator.DBNLocalFolder;
-import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
 import org.jkiss.dbeaver.model.rm.*;
 import org.jkiss.dbeaver.model.security.SMAdminController;
+import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
 import org.jkiss.dbeaver.model.websocket.event.MessageType;
 import org.jkiss.dbeaver.model.websocket.event.WSSessionLogUpdatedEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDatasourceFolderEvent;
-import org.jkiss.dbeaver.model.websocket.event.datasource.WSNetworkProfileEvent;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceParseResults;
 import org.jkiss.dbeaver.registry.ResourceTypeDescriptor;
 import org.jkiss.dbeaver.registry.ResourceTypeRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
-import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IOUtils;
 import org.jkiss.utils.Pair;
@@ -95,10 +90,9 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull Path rootPath,
         @NotNull Path userProjectsPath,
         @NotNull Path sharedProjectsPath,
-        @NotNull Supplier<SMAdminController> smControllerSupplier,
-        @NotNull LockManager lockController
+        @NotNull Supplier<SMAdminController> smControllerSupplier
     ) throws DBException {
-        super(workspace, lockController);
+        super(workspace, new FileLockController(ServletAppUtils.getServletApplication().getApplicationInstanceId()));
         this.credentialsProvider = credentialsProvider;
         this.rootPath = rootPath;
         this.userProjectsPath = userProjectsPath;
@@ -107,7 +101,7 @@ public class LocalResourceController extends BaseLocalResourceController {
 
         this.globalProjectName = DBWorkbench.getPlatform().getApplication().getDefaultProjectName();
         this.fileHandlers = RMFileOperationHandlersRegistry.getInstance().getFileHandlers();
-        this.sharedProjectsMetadataInfo = new ProjectsMetadataInfo(sharedProjectsPath, lockController);
+        this.sharedProjectsMetadataInfo = new ProjectsMetadataInfo(sharedProjectsPath);
     }
 
     @NotNull
@@ -286,7 +280,7 @@ public class LocalResourceController extends BaseLocalResourceController {
                 throw new DBException("Error creating shared project path", e);
             }
         }
-        GeneralUtils.validateResourceNameUnconditionally(name);
+        validateResourcePath(name);
         validateProjectName(null, name);
         var projectPath = sharedProjectsPath.resolve(name);
         if (Files.exists(projectPath)) {
@@ -309,7 +303,7 @@ public class LocalResourceController extends BaseLocalResourceController {
     @Override
     public RMProject updateProject(@NotNull String projectId, @NotNull RMProjectInfo projectInfo) throws DBException {
         validateProjectName(projectId, projectInfo.getName());
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("updateProject"))) {
+        try (var ignoredLock = lockController.lock(projectId, "updateProject")) {
             RMLocalProject project = getWebProject(projectId, false);
             Path targetPath = getProjectPath(projectId);
             if (!Files.exists(targetPath)) {
@@ -336,7 +330,7 @@ public class LocalResourceController extends BaseLocalResourceController {
 
     @Override
     public void deleteProject(@NotNull String projectId) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("deleteProject"))) {
+        try (var ignoredLock = lockController.lock(projectId, "deleteProject")) {
             Path targetPath = getProjectPath(projectId);
             if (!Files.exists(targetPath)) {
                 log.error(MessageFormat.format("Project folder ''{0}'' is not found", projectId));
@@ -409,13 +403,8 @@ public class LocalResourceController extends BaseLocalResourceController {
                     registry::createDataSource
                 )
             );
-        Map<String, DBWNetworkProfile> oldNetworkProfiles = registry.getNetworkProfiles().getProfiles().stream()
-            .collect(Collectors.toMap(
-                DBWNetworkProfile::getProfileId,
-                p -> p
-            ));
         DataSourceParseResults parseResults = super.updateProjectDataSourcesConfig(projectId, configuration, dataSourceIds);
-        sendConfigUpdatedEvent(registry, oldDataSources, oldNetworkProfiles, parseResults);
+        sendDataSourcesConfigUpdatedEvent(registry, oldDataSources, parseResults);
         return parseResults != null;
     }
 
@@ -508,48 +497,14 @@ public class LocalResourceController extends BaseLocalResourceController {
         return DBNLocalFolder.makeLocalFolderItemPath(projectId, folderPath);
     }
 
-    private void sendConfigUpdatedEvent(
+    private void sendDataSourcesConfigUpdatedEvent(
         @NotNull DBPDataSourceRegistry registry,
         @NotNull Map<String, DataSourceDescriptor> oldDataSources,
-        @NotNull Map<String, DBWNetworkProfile> oldNetworkProfiles,
         @Nullable DataSourceParseResults parseResults
     ) {
-        if (parseResults == null || credentialsProvider.getActiveUserCredentials() == null) {
+        if (parseResults == null || credentialsProvider.getActiveUserCredentials() == null || oldDataSources.isEmpty()) {
             return;
         }
-        boolean profilesChanged = !parseResults.removedProfiles.isEmpty();
-
-        // We don't need to check for updated profiles if there are already added or removed profiles
-        if (!profilesChanged) {
-            for (DBWNetworkProfile updatedProfile : parseResults.updatedProfiles) {
-                if (oldNetworkProfiles.containsKey(updatedProfile.getProfileId())) {
-                    DBWNetworkProfile oldProfile = oldNetworkProfiles.get(updatedProfile.getProfileId());
-                    if (!oldProfile.equalConfigurations(updatedProfile)) {
-                        profilesChanged = true;
-                        break;
-                    }
-                } else {
-                    // profile was added
-                    profilesChanged = true;
-                    break;
-                }
-            }
-        }
-
-        if (profilesChanged) {
-            ServletAppUtils.getServletApplication().getEventController().addEvent(
-                WSNetworkProfileEvent.update(
-                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
-                    credentialsProvider.getActiveUserCredentials().getUserId(),
-                    registry.getProject().getId()
-                )
-            );
-        }
-
-        if (oldDataSources.isEmpty()) {
-            return;
-        }
-
         List<String> updatedConfigurationDataSourceIds = new ArrayList<>();
         List<String> updatedNameDataSourceIds = new ArrayList<>();
         List<String> updatedInternalConfigurationDataSourceIds = new ArrayList<>();
@@ -653,6 +608,7 @@ public class LocalResourceController extends BaseLocalResourceController {
                 )
             );
         }
+
     }
 
     @NotNull
@@ -743,7 +699,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String resourcePath,
         boolean isFolder
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createResource"))) {
+        try (var ignoredLock = lockController.lock(projectId, "createResource")) {
             validateResourcePath(resourcePath);
             Path targetPath = getTargetPath(projectId, resourcePath);
             if (Files.exists(targetPath)) {
@@ -775,7 +731,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String oldResourcePath,
         @NotNull String newResourcePath
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("moveResource"))) {
+        try (var ignoredLock = lockController.lock(projectId, "moveResource")) {
             var normalizedOldResourcePath = CommonUtils.normalizeResourcePath(oldResourcePath);
             var normalizedNewResourcePath = CommonUtils.normalizeResourcePath(newResourcePath);
             if (log.isDebugEnabled()) {
@@ -847,7 +803,7 @@ public class LocalResourceController extends BaseLocalResourceController {
 
     @Override
     public void deleteResource(@NotNull String projectId, @NotNull String resourcePath, boolean recursive) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("deleteResource"))) {
+        try (var ignoredLock = lockController.lock(projectId, "deleteResource")) {
             if (log.isDebugEnabled()) {
                 log.debug("Removing resource from '" + resourcePath + "' in project '" + projectId + "'" + (recursive ? " recursive" : ""));
             }
@@ -935,7 +891,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull byte[] data,
         boolean forceOverwrite
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("setResourceContents"))) {
+        try (var ignoredLock = lockController.lock(projectId, "setResourceContents")) {
             validateResourcePath(resourcePath);
             Number fileSizeLimit = ServletAppUtils.getServletApplication()
                 .getAppConfiguration()
@@ -980,7 +936,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String propertyName,
         @Nullable Object propertyValue
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("resourcePropertyUpdate"))) {
+        try (var ignoredLock = lockController.lock(projectId, "resourcePropertyUpdate")) {
             validateResourcePath(resourcePath);
             RMLocalProject webProject = getWebProject(projectId, false);
             doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
@@ -1001,7 +957,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String resourcePath,
         @NotNull Map<String, Object> properties
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("resourcePropertyUpdate"))) {
+        try (var ignoredLock = lockController.lock(projectId, "resourcePropertyUpdate")) {
             validateResourcePath(resourcePath);
             RMLocalProject webProject = getWebProject(projectId, false);
             doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
@@ -1028,24 +984,8 @@ public class LocalResourceController extends BaseLocalResourceController {
         try {
             while (resourcePath.startsWith("/")) resourcePath = resourcePath.substring(1);
             Path targetPath = projectPath.resolve(resourcePath).normalize();
-            // hack for custom path implementations that returns / as root path
-            Iterator<Path> projectParts = projectPath.iterator();
-            Iterator<Path> targetParts = targetPath.iterator();
-            Iterator<Path> unnormalizedTargetParts = projectPath.resolve(resourcePath).iterator();
-            while (projectParts.hasNext()) {
-                if (!targetParts.hasNext()) {
-                    throw new DBException("Invalid resource path");
-                }
-                Path projectPart = projectParts.next();
-                Path targetPart = targetParts.next();
-                unnormalizedTargetParts.next();
-                if (!projectPart.equals(targetPart)) {
-                    throw new DBException("Invalid resource path");
-                }
-            }
-            // validating unnormalized target parts to avoid invalid characters in resource names
-            while (unnormalizedTargetParts.hasNext()) {
-                GeneralUtils.validateResourceNameUnconditionally(unnormalizedTargetParts.next().toString());
+            if (!targetPath.startsWith(projectPath)) {
+                throw new DBException("Invalid resource path");
             }
             return targetPath;
         } catch (InvalidPathException e) {
@@ -1163,7 +1103,6 @@ public class LocalResourceController extends BaseLocalResourceController {
         RMProjectName project = WebRMUtils.parseProjectName(projectId);
         RMProjectType type = project.getType();
         String projectName = project.getName();
-        GeneralUtils.validateResourceNameUnconditionally(projectName);
         switch (type) {
             case GLOBAL:
                 if (!projectName.equals(globalProjectName)) {
@@ -1265,14 +1204,12 @@ public class LocalResourceController extends BaseLocalResourceController {
         return getProjectPath(projectId).toAbsolutePath().relativize(path).toString().replace('\\', IPath.SEPARATOR);
     }
 
-    @NotNull
     public static Builder builder(
-        @NotNull SMCredentialsProvider credentialsProvider,
-        @NotNull DBPWorkspace workspace,
-        @NotNull LockManager lockController,
-        @NotNull Supplier<SMAdminController> smControllerSupplier
+        SMCredentialsProvider credentialsProvider,
+        DBPWorkspace workspace,
+        Supplier<SMAdminController> smControllerSupplier
     ) {
-        return new Builder(workspace, credentialsProvider, lockController, smControllerSupplier);
+        return new Builder(workspace, credentialsProvider, smControllerSupplier);
     }
 
     @Override
@@ -1288,13 +1225,10 @@ public class LocalResourceController extends BaseLocalResourceController {
         protected Path rootPath;
         protected Path userProjectsPath;
         protected Path sharedProjectsPath;
-        protected LockManager lockController;
 
         protected Builder(
-            @NotNull DBPWorkspace workspace,
-            @NotNull SMCredentialsProvider credentialsProvider,
-            @NotNull LockManager lockController,
-            @NotNull Supplier<SMAdminController> smControllerSupplier
+            DBPWorkspace workspace, SMCredentialsProvider credentialsProvider,
+            Supplier<SMAdminController> smControllerSupplier
         ) {
             this.workspace = workspace;
             this.credentialsProvider = credentialsProvider;
@@ -1302,38 +1236,25 @@ public class LocalResourceController extends BaseLocalResourceController {
             this.rootPath = RMUtils.getRootPath();
             this.userProjectsPath = RMUtils.getUserProjectsPath();
             this.sharedProjectsPath = RMUtils.getSharedProjectsPath();
-            this.lockController = lockController;
         }
 
-        @NotNull
-        public Builder setRootPath(@NotNull Path rootPath) {
+        public Builder setRootPath(Path rootPath) {
             this.rootPath = rootPath;
             return this;
         }
 
-        @NotNull
-        public Builder setUserProjectsPath(@NotNull Path userProjectsPath) {
+        public Builder setUserProjectsPath(Path userProjectsPath) {
             this.userProjectsPath = userProjectsPath;
             return this;
         }
 
-        @NotNull
-        public Builder setSharedProjectsPath(@NotNull Path sharedProjectsPath) {
+        public Builder setSharedProjectsPath(Path sharedProjectsPath) {
             this.sharedProjectsPath = sharedProjectsPath;
             return this;
         }
 
-        @NotNull
         public LocalResourceController build() throws DBException {
-            return new LocalResourceController(
-                workspace,
-                credentialsProvider,
-                rootPath,
-                userProjectsPath,
-                sharedProjectsPath,
-                smController,
-                lockController
-            );
+            return new LocalResourceController(workspace, credentialsProvider, rootPath, userProjectsPath, sharedProjectsPath, smController);
         }
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/ProjectsMetadataInfo.java

@@ -17,15 +17,14 @@
 package io.cloudbeaver.model.rm.local;
 
 import com.google.gson.reflect.TypeToken;
+import io.cloudbeaver.utils.ServletAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
-import org.jkiss.dbeaver.model.fs.lock.LockManager;
-import org.jkiss.dbeaver.model.fs.lock.LockOptions;
-import org.jkiss.dbeaver.model.fs.lock.LockTarget;
+import org.jkiss.dbeaver.model.fs.lock.FileLockController;
 import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
 import org.jkiss.dbeaver.model.rm.RMProjectInfo;
 import org.jkiss.dbeaver.model.rm.RMProjectType;
@@ -46,12 +45,12 @@ public class ProjectsMetadataInfo {
 
     private final Map<String, RMProjectInfo> projectsInfo = new LinkedHashMap<>();
     private final Path projectsPath;
-    private final LockManager lockController;
+    private final FileLockController lockController;
 
 
-    public ProjectsMetadataInfo(@NotNull Path projectsPath, @NotNull LockManager lockController) throws DBException {
+    public ProjectsMetadataInfo(@NotNull Path projectsPath) throws DBException {
         this.projectsPath = projectsPath;
-        this.lockController = lockController;
+        this.lockController = new FileLockController(ServletAppUtils.getServletApplication().getApplicationInstanceId());
         readProjectInfos(projectsPath);
     }
 
@@ -140,7 +139,7 @@ public class ProjectsMetadataInfo {
     }
 
     private void saveProjectsInfo() {
-        try (var lock = lockController.lock(LockTarget.of(PROJECTS_INFO_FILE_NAME), LockOptions.of("saveProjectsInfo"))) {
+        try (var lock = lockController.lock(PROJECTS_INFO_FILE_NAME, "saveProjectsInfo")) {
             log.info("Saving project information");
             Files.writeString(projectsPath.resolve(PROJECTS_INFO_FILE_NAME), JSONUtils.GSON.toJson(projectsInfo));
         } catch (IOException e) {
@@ -149,4 +148,4 @@ public class ProjectsMetadataInfo {
             log.error("Error locking file " + PROJECTS_INFO_FILE_NAME + ": " + e.getMessage());
         }
     }
-}
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,21 +55,14 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     @NotNull
     protected final ServletApplication application;
     protected volatile long lastAccessTime;
-    @NotNull
-    private final SessionType sessionType;
 
     private final List<CBWebSessionEventHandler> sessionEventHandlers = new CopyOnWriteArrayList<>();
     private WebSessionEventsFilter eventsFilter;
     private final WebSessionWorkspace workspace;
 
-    public BaseWebSession(
-        @NotNull String id,
-        @NotNull ServletApplication application,
-        @NotNull SessionType sessionType
-    ) throws DBException {
+    public BaseWebSession(@NotNull String id, @NotNull ServletApplication application) throws DBException {
         this.id = id;
         this.application = application;
-        this.sessionType = sessionType;
         this.createTime = System.currentTimeMillis();
         this.lastAccessTime = this.createTime;
         this.workspace = createWebWorkspace();
@@ -123,16 +116,6 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         }
     }
 
-    public void migrateEventHandlersTo(@NotNull BaseWebSession target) {
-        synchronized (sessionEventHandlers) {
-            for (CBWebSessionEventHandler handler : sessionEventHandlers) {
-                handler.migrateToSession(target);
-                target.addEventHandler(handler);
-            }
-            sessionEventHandlers.clear();
-        }
-    }
-
     public boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
         return userContext.refresh(smAuthInfo);
     }
@@ -155,17 +138,6 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         }
     }
 
-    /**
-     * Refreshes user permissions, teams and accessible projects.
-     * <p>
-     * Unlike {@link #refreshUserData()} this method must not re-create heavyweight session state
-     * (navigator model, session projects, connection caches), so it is safe to call
-     * for foreign sessions on server-wide events.
-     */
-    public void refreshUserPermissions() {
-        refreshUserData();
-    }
-
     @NotNull
     @Override
     public SMAuthSpace getSessionSpace() {
@@ -179,7 +151,7 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     }
 
     protected synchronized void clearSessionContext() {
-        this.workspace.getAuthContext().clearContext(false);
+        this.workspace.getAuthContext().clear();
         this.workspace.getAuthContext().addSession(this);
     }
 
@@ -204,11 +176,6 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         return lastAccessTime;
     }
 
-    @NotNull
-    public SessionType getSessionType() {
-        return sessionType;
-    }
-
     public void touchSession() {
         this.lastAccessTime = System.currentTimeMillis();
     }
@@ -220,17 +187,16 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
 
     @Override
     public void close() {
-        cleanUpSession(true);
         super.close();
+        cleanUpSession(true);
     }
 
     public void close(boolean clearTokens, boolean sendSessionExpiredEvent) {
         cleanUpSession(sendSessionExpiredEvent);
-        super.close();
     }
 
     private void cleanUpSession(boolean sendSessionExpiredEvent) {
-        application.getEventController().addEvent(new WSEventDeleteTempFile(getUserContext().getSmSessionId()));
+        application.getEventController().addEvent(new WSEventDeleteTempFile(getSessionId()));
         synchronized (sessionEventHandlers) {
             var sessionExpiredEvent = new WSSessionExpiredEvent();
             for (CBWebSessionEventHandler sessionEventHandler : sessionEventHandlers) {

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

@@ -1,23 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.model.session;
-
-public enum SessionType {
-    WEB,
-    HEADLESS,
-    API_TOKEN
-}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ public class WebHeadlessSession extends BaseWebSession {
         @NotNull String id,
         @NotNull ServletAuthApplication application
     ) throws DBException {
-        super(id, application, SessionType.HEADLESS);
+        super(id, application);
     }
 
     @Override

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

@@ -17,7 +17,6 @@
 package io.cloudbeaver.model.session;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.utils.HttpConstants;
 
@@ -32,16 +31,12 @@ public class WebHttpRequestInfo {
     private final String lastRemoteAddress;
     @Nullable
     private final String lastRemoteUserAgent;
-    @NotNull
-    private final SessionType sessionType;
 
     public WebHttpRequestInfo(HttpServletRequest request) {
-        this(
-            request.getSession() == null ? null : request.getSession().getId(),
-            request.getAttribute("locale"),
-            request.getRemoteAddr(),
-            request.getHeader(USER_AGENT)
-        );
+        this.id = request.getSession() == null ? null : request.getSession().getId();
+        this.locale = request.getAttribute("locale");
+        this.lastRemoteAddress = request.getRemoteAddr();
+        this.lastRemoteUserAgent = request.getHeader(USER_AGENT);
     }
 
     public WebHttpRequestInfo(
@@ -49,22 +44,11 @@ public class WebHttpRequestInfo {
         @Nullable Object locale,
         @Nullable String lastRemoteAddress,
         @Nullable String lastRemoteUserAgent
-    ) {
-        this(id, locale, lastRemoteAddress, lastRemoteUserAgent, SessionType.WEB);
-    }
-
-    public WebHttpRequestInfo(
-        @Nullable String id,
-        @Nullable Object locale,
-        @Nullable String lastRemoteAddress,
-        @Nullable String lastRemoteUserAgent,
-        @NotNull SessionType sessionType
     ) {
         this.id = id;
         this.locale = locale;
         this.lastRemoteAddress = lastRemoteAddress;
         this.lastRemoteUserAgent = lastRemoteUserAgent;
-        this.sessionType = sessionType;
     }
 
     @Nullable
@@ -86,9 +70,4 @@ public class WebHttpRequestInfo {
     public String getLastRemoteUserAgent() {
         return lastRemoteUserAgent;
     }
-
-    @NotNull
-    public SessionType getSessionType() {
-        return sessionType;
-    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,8 +116,7 @@ public class WebSession extends BaseWebSession
             CommonUtils.toString(requestInfo.getLocale()),
             application,
             sessionHandlers,
-            requestInfo.getLastRemoteAddress(),
-            requestInfo.getSessionType()
+            requestInfo.getLastRemoteAddress()
         );
         updateSessionParameters(requestInfo);
     }
@@ -129,18 +128,7 @@ public class WebSession extends BaseWebSession
         @NotNull Map<String, DBWSessionHandler<WebSession>> sessionHandlers,
         @Nullable String remoteAddr
     ) throws DBException {
-        this(id, locale, application, sessionHandlers, remoteAddr, SessionType.WEB);
-    }
-
-    protected WebSession(
-        @NotNull String id,
-        @Nullable String locale,
-        @NotNull ServletApplication application,
-        @NotNull Map<String, DBWSessionHandler<WebSession>> sessionHandlers,
-        @Nullable String remoteAddr,
-        @NotNull SessionType sessionType
-    ) throws DBException {
-        super(id, application, sessionType);
+        super(id, application);
         if (CommonUtils.isEmpty(remoteAddr)) {
             throw new DBException("Remote address cannot be empty");
         }
@@ -262,52 +250,10 @@ public class WebSession extends BaseWebSession
 
     @Override
     public void refreshUserData() {
-        refreshUserPermissions();
-
-        initNavigatorModel();
-    }
-
-    @Override
-    public void refreshUserPermissions() {
         super.refreshUserData();
         refreshSessionAuth();
-        if (getUserId() == null && globalProject != null) {
-            // refreshSessionAuth() updates accessible connections for named users only,
-            // for anonymous sessions this was done by initNavigatorModel()
-            globalProject.refreshAccessibleConnectionIds();
-        }
-        syncSessionProjects();
-    }
 
-    /**
-     * Adds/removes only those session projects whose accessibility actually changed.
-     * <p>
-     * Unlike {@link #initNavigatorModel()} this keeps existing projects, and therefore
-     * their live connections and SQL contexts, intact.
-     */
-    private void syncSessionProjects() {
-        if (getNavigatorModel() == null) {
-            // model was never initialized for this session - nothing to sync
-            return;
-        }
-        try {
-            Map<String, RMProject> actualProjects = new LinkedHashMap<>();
-            for (RMProject rmProject : getRmController().listAccessibleProjects()) {
-                actualProjects.put(rmProject.getId(), rmProject);
-            }
-            for (WebSessionProjectImpl project : new ArrayList<>(getWorkspace().getProjects())) {
-                if (actualProjects.remove(project.getId()) == null && !project.isInMemory()) {
-                    // in-memory (anonymous) projects are never listed by RM
-                    deleteSessionProject(project);
-                }
-            }
-            for (RMProject rmProject : actualProjects.values()) {
-                createWebProject(rmProject);
-            }
-        } catch (DBException e) {
-            addSessionError(e);
-            log.error("Error synchronizing accessible projects", e);
-        }
+        initNavigatorModel();
     }
 
     // Note: for admin use only
@@ -355,7 +301,7 @@ public class WebSession extends BaseWebSession
 
             loadProjects();
 
-            this.navigatorModel = new DBNModel(DBWorkbench.getPlatform(), getWorkspace());
+            this.navigatorModel = new DBNModel(DBWorkbench.getPlatform(), getWorkspace().getProjects());
             this.navigatorModel.setModelAuthContext(getWorkspace().getAuthContext());
             this.navigatorModel.initialize();
 
@@ -502,25 +448,6 @@ public class WebSession extends BaseWebSession
             navigatorModelLock.readLock().unlock();
         }
     }
-
-    /**
-     * Initializes the project's lazy database branch while preventing the navigator model from being replaced.
-     */
-    public void initializeProjectNavigator(@NotNull WebSessionProjectImpl project) {
-        navigatorModelLock.readLock().lock();
-        try {
-            if (navigatorModel == null) {
-                return;
-            }
-            var projectNode = navigatorModel.getRoot().getProjectNode(project);
-            if (projectNode != null) {
-                projectNode.getDatabases();
-            }
-        } finally {
-            navigatorModelLock.readLock().unlock();
-        }
-    }
-
     /**
      * Returns and clears progress messages
      */
@@ -565,6 +492,7 @@ public class WebSession extends BaseWebSession
     public void close() {
         try {
             resetNavigationModel();
+            resetSessionCache();
         } catch (Throwable e) {
             log.error(e);
         }
@@ -581,6 +509,7 @@ public class WebSession extends BaseWebSession
     public void close(boolean clearTokens, boolean sendSessionExpiredEvent) {
         try {
             resetNavigationModel();
+            resetSessionCache();
         } catch (Throwable e) {
             log.error(e);
         }
@@ -680,13 +609,11 @@ public class WebSession extends BaseWebSession
         }
     }
 
-    @NotNull
     public WebAsyncTaskInfo createAndRunAsyncTask(@NotNull String taskName, @NotNull WebAsyncTaskProcessor<?> runnable) {
         WebAsyncTaskInfo asyncTask = createAsyncTask(taskName);
         return runAsyncTask(asyncTask, runnable);
     }
 
-    @NotNull
     public WebAsyncTaskInfo runAsyncTask(@NotNull WebAsyncTaskInfo asyncTask, @NotNull WebAsyncTaskProcessor<?> runnable) {
         AbstractJob job = new AbstractCancelableJob(asyncTask.getName()) {
             @NotNull
@@ -1110,6 +1037,7 @@ public class WebSession extends BaseWebSession
         }
     }
 
+
     public void handleTaskConfirmationWithParameters(@NotNull String taskId, @NotNull Map<String, Object> parameters) {
         String attributeName = getTaskConfirmationAttributeName(taskId);
         CompletableFuture<Map<String, Object>> confirmationFuture = getAttribute(attributeName);
@@ -1121,16 +1049,6 @@ public class WebSession extends BaseWebSession
         }
     }
 
-    public void handleActionCancelledEvent(@NotNull String actionId) {
-        Object attributeValue = getAttribute(actionId);
-        if (!(attributeValue instanceof CompletableFuture<?> future)) {
-            log.info("Action to be cancelled not found, skipping: " + actionId);
-            return;
-        }
-        future.completeExceptionally(new DBWebException("Action cancelled by user: " + actionId));
-        removeAttribute(actionId);
-    }
-
     @NotNull
     private String getTaskConfirmationAttributeName(@NotNull String taskId) {
         return WebSQLConstants.TASK_CONFIRMATION_ATTR_PREFIX + taskId;

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,13 +68,6 @@ public class WebSessionEventsFilter {
         }
     }
 
-    public void migrateTo(@NotNull WebSessionEventsFilter target) {
-        synchronized (target.subscribedProjectIds) {
-            target.subscribedEventTopics.addAll(this.subscribedEventTopics);
-            target.subscribedProjectIds.addAll(this.subscribedProjectIds);
-        }
-    }
-
     public boolean isEventAllowed(WSEvent event) {
         if (event.isForceProcessed()) {
             return true;

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package io.cloudbeaver.model.session;
 
 import io.cloudbeaver.WebSessionProjectImpl;
-import io.cloudbeaver.utils.ServletAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -27,7 +26,6 @@ import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
-import org.jkiss.dbeaver.model.fs.DBFFileSystemManager;
 import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.rm.RMUtils;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -47,7 +45,6 @@ public class WebSessionWorkspace implements DBPWorkspace {
     private final SessionContextImpl workspaceAuthContext;
     private final List<WebSessionProjectImpl> accessibleProjects = new ArrayList<>();
     private WebSessionProjectImpl activeProject;
-    private DBFFileSystemManager fileSystemManager;
 
     public WebSessionWorkspace(BaseWebSession session) {
         this.session = session;
@@ -202,28 +199,12 @@ public class WebSessionWorkspace implements DBPWorkspace {
 
     @Override
     public boolean hasRealmPermission(@NotNull String permission) {
-        if (getWebSession() instanceof WebSession webSession) {
-            return webSession.getSessionPermissions().contains(permission);
-        }
         return false;
     }
 
     @Override
     public boolean supportsRealmFeature(@NotNull String feature) {
-        return ServletAppUtils.getServletApplication().getAppConfiguration().isFeatureEnabled(feature);
+        return false;
     }
 
-    @NotNull
-    @Override
-    public synchronized DBFFileSystemManager getFileSystemManager() {
-        if (fileSystemManager == null) {
-            synchronized (this) {
-                if (fileSystemManager == null) {
-                    fileSystemManager = new DBFFileSystemManager(session.getWorkspace());
-                }
-            }
-        }
-
-        return fileSystemManager;
-    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -245,7 +245,7 @@ public class WebUserContext implements SMCredentialsProvider {
         return secretController;
     }
 
-    @Nullable
+    @NotNull
     public String getSmSessionId() {
         return smSessionId;
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java

@@ -114,9 +114,4 @@ public class WebUser {
     public String getDisableReason() {
         return user.getDisableReason();
     }
-
-    @Nullable
-    public Instant getLastLoginTime() {
-        return user.getLastLoginTime();
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,6 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.security.SMAuthCredentialsProfile;
 import org.jkiss.dbeaver.model.security.SMAuthProviderDescriptor;
 import org.jkiss.dbeaver.model.security.SMSubjectType;
-import org.jkiss.dbeaver.utils.GeneralUtils;
-import org.jkiss.dbeaver.utils.SystemVariablesResolver;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 
@@ -59,7 +57,6 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
     private final boolean isPrivate;
     private final boolean isAuthHidden;
     private final boolean isCaseInsensitive;
-    private final boolean sameTabRedirectOnLogout;
     private final boolean serviceProvider;
     private final String[] requiredFeatures;
     private final boolean isRequired;
@@ -76,7 +73,6 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
         this.isRequired = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_REQUIRED));
         this.isAuthHidden = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_AUTH_HIDDEN));
         this.isCaseInsensitive = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_CASE_INSENSITIVE));
-        this.sameTabRedirectOnLogout = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_SAME_TAB_LOGOUT_REDIRECT));
         this.serviceProvider = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_SERVICE_PROVIDER));
 
         for (IConfigurationElement cfgElement : cfg.getChildren(WebRegistryConstant.TAG_CONFIGURATION)) {
@@ -114,9 +110,7 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
     }
 
     public String getDescription() {
-        return GeneralUtils.replaceVariables(
-            cfg.getAttribute(WebRegistryConstant.ATTR_DESCRIPTION), SystemVariablesResolver.INSTANCE
-        );
+        return cfg.getAttribute(WebRegistryConstant.ATTR_DESCRIPTION);
     }
 
     public DBPImage getIcon() {
@@ -131,10 +125,6 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
         return trusted;
     }
 
-    public boolean isSameTabRedirectOnLogout() {
-        return sameTabRedirectOnLogout;
-    }
-
     public boolean isPrivate() {
         return isPrivate;
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebRegistryConstant.java

@@ -29,7 +29,6 @@ public class WebRegistryConstant {
     public static final String ATTR_REQUIRED = "required";
     public static final String ATTR_AUTH_HIDDEN = "authHidden";
     public static final String ATTR_CASE_INSENSITIVE = "caseInsensitive";
-    public static final String ATTR_SAME_TAB_LOGOUT_REDIRECT = "sameTabRedirectOnLogout";
     public static final String ATTR_REQUIRED_FEATURES = "requiredFeatures";
     public static final String ATTR_CATEGORIES = "categories";
     public static final String ATTR_SERVICE_PROVIDER = "serviceProvider";

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/BaseServletPlatform.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ public abstract class BaseServletPlatform extends BasePlatformImpl {
         // Remove temp folder
         if (tempFolder != null) {
 
-            if (!ContentUtils.deleteFileRecursive(tempFolder)) {
+            if (!ContentUtils.deleteFileRecursive(tempFolder.toFile())) {
                 log.warn("Can't delete temp folder '" + tempFolder.toAbsolutePath() + "'");
             }
             tempFolder = null;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java

@@ -82,6 +82,4 @@ public class CBConstants {
     public static final String DEFAULT_CLOUD_PROJECT_NAME = "GlobalConfiguration";
 
     public static final String SECURED_VALUE = "******";
-    public static final String PREF_DATA_EDITOR_EXPORT_DISABLED_OLD = "plugin.data-viewer.export.disabled";
-    public static final String PREF_DATA_EDITOR_IMPORT_DISABLED_OLD = "plugin.data-import.disabled";
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/ServerGlobalWorkspace.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,14 +20,11 @@ import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.model.app.ServletApplication;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPProject;
-import org.jkiss.dbeaver.model.auth.SMSession;
 import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
 import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
-import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.utils.CommonUtils;
 
 import java.io.IOException;
@@ -54,18 +51,12 @@ public class ServerGlobalWorkspace extends BaseWorkspaceImpl {
         @NotNull DBPPlatform platform,
         @NotNull ServletApplication application
     ) {
-        super(platform, application.getWorkspacePath());
+        super(platform, application.getWorkspaceDirectory());
         this.application = application;
     }
 
-    @NotNull
     @Override
-    protected SMSession acquireWorkspaceSession(@NotNull DBRProgressMonitor monitor) throws DBException {
-        return new ServerGlobalWorkspaceSession(this);
-    }
-
-    @Override
-    public void initializeProjects() throws DBException {
+    public void initializeProjects() {
         initializeWorkspaceSession();
 
         // Load global project
@@ -115,9 +106,4 @@ public class ServerGlobalWorkspace extends BaseWorkspaceImpl {
         }
         return null;
     }
-
-    @Override
-    public boolean supportsRealmFeature(@NotNull String feature) {
-        return application.getAppConfiguration().isFeatureEnabled(feature);
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/ServerGlobalWorkspaceSession.java

@@ -1,36 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.server;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.app.DBPWorkspace;
-import org.jkiss.dbeaver.model.impl.app.LocalWorkspaceSession;
-import org.jkiss.dbeaver.model.secret.DBSSecretController;
-
-public class ServerGlobalWorkspaceSession extends LocalWorkspaceSession {
-
-    public ServerGlobalWorkspaceSession(@NotNull DBPWorkspace workspace) {
-        super(workspace);
-    }
-
-    @Nullable
-    @Override
-    public DBSSecretController getSecretController() {
-        return null;
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/DBWServiceBindingServlet.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ public interface DBWServiceBindingServlet<APPLICATION extends ServletApplication
         return true;
     }
 
-    void addServlets(@NotNull APPLICATION application, @NotNull DBWServletContext servletContext) throws DBException;
+    void addServlets(APPLICATION application, DBWServletContext servletContext) throws DBException;
 
     @NotNull
     default List<String> getExcludedServletPaths(@NotNull APPLICATION application) {

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

@@ -192,16 +192,9 @@ public class ServletAppUtils {
         @NotNull String serviceId,
         @NotNull String origin
     ) throws DBException {
-        String finalOrigin = ServletAppUtils.substringBeforeRootURI(webAuthApplication.modifyOrigin(origin));
-        String serviceUriSegment = removeSideSlashes(webAuthApplication.getAuthServiceUriSegment());
-        String rootUri = removeSideSlashes(getServletApplication().getRootURI());
-        if (finalOrigin.endsWith("/" + rootUri) && serviceUriSegment.startsWith(rootUri + "/")) {
-            finalOrigin = finalOrigin.substring(0, finalOrigin.length() - rootUri.length());
-        }
+        String finalOrigin =  webAuthApplication.modifyOrigin(origin);
         StringBuilder authUriBuilder = new StringBuilder(removeSideSlashes(finalOrigin));
-        if (CommonUtils.isNotEmpty(rootUri)) {
-            authUriBuilder.append("/").append(rootUri);
-        }
+        String serviceUriSegment = removeSideSlashes(webAuthApplication.getAuthServiceUriSegment());
         if (CommonUtils.isNotEmpty(serviceUriSegment)) {
             authUriBuilder.append("/").append(serviceUriSegment);
         }
@@ -235,14 +228,6 @@ public class ServletAppUtils {
         response.addCookie(sessionCookie);
     }
 
-    public static String getHeaderOrLegacy(HttpServletRequest request, String headerName, String legacyHeaderName) {
-        String value = request.getHeader(headerName);
-        if (CommonUtils.isEmpty(value)) {
-            value = request.getHeader(legacyHeaderName);
-        }
-        return value;
-    }
-
     public static String getRequestCookie(HttpServletRequest request, String cookieName) {
         Cookie[] cookies = request.getCookies();
         if (cookies != null) {
@@ -308,27 +293,24 @@ public class ServletAppUtils {
         }
     }
 
-    @NotNull
-    public static String getHostOriginFromRequest(@NotNull HttpServletRequest request) {
-        return substringBeforeRootURI(getOriginFromRequest(request));
-    }
-
     @NotNull
     public static String getOriginFromRequest(@NotNull HttpServletRequest request) {
         String origin = request.getHeader(HEADER_ORIGIN);
         if (log.isTraceEnabled()) {
             log.trace("Origin header: " + origin);
         }
-        if ("null".equals(origin)) {
-            //strange identity provider bug
-            origin = null;
-        }
         if (CommonUtils.isEmpty(origin)) {
             origin = request.getHeader(HEADER_X_ORIGIN);
             if (log.isTraceEnabled()) {
                 log.trace("X-Origin header: " + origin);
             }
         }
+        if (CommonUtils.isEmpty(origin)) {
+            origin = request.getHeader(HEADER_REFERER);
+            if (log.isTraceEnabled()) {
+                log.trace("Referer header: " + origin);
+            }
+        }
         String forwardedScheme = request.getHeader(HEADER_FORWARDED_SCHEME);
         if (CommonUtils.isEmpty(forwardedScheme)) {
             forwardedScheme = request.getHeader(HEADER_FORWARDED_PROTO);
@@ -339,7 +321,8 @@ public class ServletAppUtils {
             if (log.isTraceEnabled()) {
                 log.trace("forwarded origin: " + origin);
             }
-        } else if (CommonUtils.isEmpty(origin)) {
+        }
+        if (CommonUtils.isEmpty(origin)) {
             URI requestUrl = URI.create(request.getRequestURL().toString());
             if (log.isTraceEnabled()) {
                 log.trace("Request URL: " + requestUrl);
@@ -363,34 +346,13 @@ public class ServletAppUtils {
                 log.error("Failed to parse port from header: " + request.getHeader(HEADER_FORWARDED_PORT), e);
             }
         }
-
-        String finalScheme = uri.getScheme();
-        String finalHost = uri.getHost();
-        int finalPort = port;
-        boolean changed = false;
-        if (CommonUtils.isNotEmpty(forwardedScheme) && !forwardedScheme.equals(finalScheme)) {
-            finalScheme = forwardedScheme;
-            changed = true;
-        }
-        if (CommonUtils.isNotEmpty(forwardedHost) && !forwardedHost.equals(finalHost)) {
-            finalHost = forwardedHost;
-            changed = true;
-        }
         if (DEFAULT_PORTS.contains(port)) {
-            finalPort = -1;
-            changed = true;
-        }
-        if (log.isTraceEnabled()) {
-            log.trace("Origin URI: " + origin);
-        }
-
-        if (changed) {
             try {
                 origin = new URI(
-                    finalScheme,
+                    uri.getScheme(),
                     uri.getUserInfo(),
-                    finalHost,
-                    finalPort,
+                    uri.getHost(),
+                    -1,
                     uri.getPath(),
                     uri.getQuery(),
                     uri.getFragment()
@@ -399,6 +361,9 @@ public class ServletAppUtils {
                 log.error("Failed to create URI without port", e);
             }
         }
+        if (log.isTraceEnabled()) {
+            log.trace("Origin URI: " + origin);
+        }
 
         return origin;
     }

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

@@ -33,7 +33,6 @@ import org.jkiss.dbeaver.model.access.DBAAuthCredentials;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
-import org.jkiss.dbeaver.model.connection.DBPConnectionType;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderDescriptor;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNativeCredentials;
@@ -41,7 +40,6 @@ import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceDisconnectEvent;
-import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -57,12 +55,9 @@ public class WebDataSourceUtils {
     private WebDataSourceUtils() {
     }
 
-    public static void saveCredentialsInDataSource(
-        @NotNull WebConnectionInfo webConnectionInfo,
-        @NotNull DBPDataSourceContainer dataSourceContainer,
-        @NotNull DBPConnectionConfiguration configuration
-    ) {
+    public static void saveCredentialsInDataSource(WebConnectionInfo webConnectionInfo, DBPDataSourceContainer dataSourceContainer, DBPConnectionConfiguration configuration) {
         // Properties passed from web
+        // webConnectionInfo may be null in some cases (e.g. connection test when no actual connection exist yet)
         Map<String, Object> authProperties = webConnectionInfo.getSavedAuthProperties();
         if (authProperties != null) {
             authProperties.forEach((s, o) -> configuration.setAuthProperty(s, CommonUtils.toString(o)));
@@ -167,24 +162,18 @@ public class WebDataSourceUtils {
     }
 
 
-    public static boolean disconnectDataSource(
-        @NotNull WebSession webSession,
-        @NotNull DBPDataSourceContainer dataSource,
-        boolean sendDisconnectEvent
-    ) {
+    public static boolean disconnectDataSource(@NotNull WebSession webSession, @NotNull DBPDataSourceContainer dataSource) {
         if (dataSource.isConnected()) {
             try {
                 dataSource.disconnect(webSession.getProgressMonitor());
-                if (sendDisconnectEvent) {
-                    webSession.addSessionEvent(
-                        new WSDataSourceDisconnectEvent(
-                            dataSource.getProject().getId(),
-                            dataSource.getId(),
-                            WebEventUtils.getSmSessionId(webSession),
-                            webSession.getUserId()
-                        )
-                    );
-                }
+                webSession.addSessionEvent(
+                    new WSDataSourceDisconnectEvent(
+                        dataSource.getProject().getId(),
+                        dataSource.getId(),
+                        webSession.getSessionId(),
+                        webSession.getUserId()
+                    )
+                );
                 return true;
             } catch (DBException e) {
                 log.error("Error closing connection", e);
@@ -310,7 +299,9 @@ public class WebDataSourceUtils {
         if (config.getKeepAliveInterval() >= 0) {
             dsConfig.setKeepAliveInterval(config.getKeepAliveInterval());
         }
-        dsConfig.getBootstrap().setDefaultAutoCommit(config.isDefaultAutoCommit());
+        if (config.isDefaultAutoCommit() != null) {
+            dsConfig.getBootstrap().setDefaultAutoCommit(config.isDefaultAutoCommit());
+        }
         dsConfig.getBootstrap().setDefaultCatalogName(config.getDefaultCatalogName());
         dsConfig.getBootstrap().setDefaultSchemaName(config.getDefaultSchemaName());
         // Save provider props
@@ -323,19 +314,8 @@ public class WebDataSourceUtils {
         if (config.getConfigurationType() != null) {
             dsConfig.setConfigurationType(config.getConfigurationType());
         }
-        if (config.getConnectionType() != null) {
-            DBPConnectionType connectionType = DataSourceProviderRegistry.getInstance().getConnectionType(config.getConnectionType(), null);
-            if (connectionType != null) {
-                dsConfig.setConnectionType(connectionType);
-            }
-        }
-
         if (CommonUtils.isEmpty(config.getUrl())) {
-            try {
-                dsConfig.setUrl(driver.getConnectionURL(dsConfig));
-            } catch (DBException e) {
-                log.error("Error preparing connection URL", e);
-            }
+            dsConfig.setUrl(driver.getConnectionURL(dsConfig));
         }
         // Save network handlers
         if (config.getNetworkHandlersConfig() != null) {

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,21 +17,119 @@
 package io.cloudbeaver.utils;
 
 import io.cloudbeaver.model.WebAsyncTaskInfo;
-import io.cloudbeaver.model.session.BaseWebSession;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.websocket.event.task.WSSessionTaskInfoEvent;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.security.SMSubjectType;
 import org.jkiss.dbeaver.model.websocket.WSConstants;
 import org.jkiss.dbeaver.model.websocket.event.WSEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDatasourceFolderEvent;
 import org.jkiss.dbeaver.model.websocket.event.permissions.WSSubjectPermissionEvent;
 import org.jkiss.dbeaver.model.websocket.event.resource.WSResourceProperty;
 import org.jkiss.dbeaver.model.websocket.event.resource.WSResourceUpdatedEvent;
 
-import java.util.Objects;
+import java.util.List;
 
 public class WebEventUtils {
+    /**
+     * adds events of updated datasource to event controller
+     *
+     * @param project      project of updated database
+     * @param session      web session
+     * @param datasourceId id of datasource
+     * @param eventAction  type of event
+     */
+    public static void addDataSourceUpdatedEvent(
+        DBPProject project,
+        WebSession session,
+        String datasourceId,
+        WSConstants.EventAction eventAction,
+        WSDataSourceProperty property
+    ) {
+        if (project == null) {
+            return;
+        }
+        WSEvent event = null;
+        switch (eventAction) {
+            case CREATE:
+                event = WSDataSourceEvent.create(
+                    session.getUserContext().getSmSessionId(),
+                    session.getUserId(),
+                    project.getId(),
+                    List.of(datasourceId),
+                    property
+                );
+                break;
+            case DELETE:
+                event = WSDataSourceEvent.delete(
+                    session.getUserContext().getSmSessionId(),
+                    session.getUserId(),
+                    project.getId(),
+                    List.of(datasourceId),
+                    property
+                );
+                break;
+            case UPDATE:
+                event = WSDataSourceEvent.update(
+                    session.getUserContext().getSmSessionId(),
+                    session.getUserId(),
+                    project.getId(),
+                    List.of(datasourceId),
+                    property
+                );
+                break;
+        }
+        if (event == null) {
+            return;
+        }
+        ServletAppUtils.getServletApplication().getEventController().addEvent(event);
+    }
+
+    public static void addNavigatorNodeUpdatedEvent(
+        DBPProject project,
+        WebSession session,
+        String nodePath,
+        WSConstants.EventAction eventAction
+    ) {
+        if (project == null) {
+            return;
+        }
+        WSEvent event = null;
+        switch (eventAction) {
+            case CREATE:
+                event = WSDatasourceFolderEvent.create(
+                    session.getUserContext().getSmSessionId(),
+                    session.getUserId(),
+                    project.getId(),
+                    List.of(nodePath)
+                );
+                break;
+            case DELETE:
+                event = WSDatasourceFolderEvent.delete(
+                    session.getUserContext().getSmSessionId(),
+                    session.getUserId(),
+                    project.getId(),
+                    List.of(nodePath)
+                );
+                break;
+            case UPDATE:
+                event = WSDatasourceFolderEvent.update(
+                    session.getUserContext().getSmSessionId(),
+                    session.getUserId(),
+                    project.getId(),
+                    List.of(nodePath)
+                );
+                break;
+        }
+        if (event == null) {
+            return;
+        }
+        ServletAppUtils.getServletApplication().getEventController().addEvent(event);
+    }
 
     public static void addRmResourceUpdatedEvent(
         String projectId,
@@ -55,7 +153,7 @@ public class WebEventUtils {
         switch (eventAction) {
             case CREATE:
                 event = WSResourceUpdatedEvent.create(
-                    WebEventUtils.getSmSessionId(session),
+                    session.getUserContext().getSmSessionId(),
                     session.getUserId(),
                     projectId,
                     resourcePath,
@@ -65,7 +163,7 @@ public class WebEventUtils {
                 break;
             case DELETE:
                 event = WSResourceUpdatedEvent.delete(
-                    WebEventUtils.getSmSessionId(session),
+                    session.getUserContext().getSmSessionId(),
                     session.getUserId(),
                     projectId,
                     resourcePath,
@@ -75,7 +173,7 @@ public class WebEventUtils {
                 break;
             case UPDATE:
                 event = WSResourceUpdatedEvent.update(
-                    WebEventUtils.getSmSessionId(session),
+                    session.getUserContext().getSmSessionId(),
                     session.getUserId(),
                     projectId,
                     resourcePath,
@@ -115,12 +213,4 @@ public class WebEventUtils {
         ServletAppUtils.getServletApplication().getEventController().addEvent(event);
     }
 
-    @Nullable
-    public static String getSmSessionId(@NotNull BaseWebSession webSession) {
-        return webSession.getUserContext().getSmSessionId();
-    }
-
-    public static boolean isSmSessionIdEquals(@NotNull BaseWebSession webSession, @Nullable String smSessionId) {
-        return Objects.equals(getSmSessionId(webSession), smSessionId);
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/websocket/CBWebSessionEventHandler.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  */
 package io.cloudbeaver.websocket;
 
-import io.cloudbeaver.model.session.BaseWebSession;
-import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.websocket.event.WSEvent;
 
@@ -26,6 +24,4 @@ public interface CBWebSessionEventHandler {
 
     void close();
 
-    void migrateToSession(@NotNull BaseWebSession newSession);
-
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/websocket/event/client/WSSessionCancelActionClientEvent.java

@@ -1,40 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver.websocket.event.client;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.model.websocket.WSConstants;
-import org.jkiss.dbeaver.model.websocket.event.WSClientEvent;
-
-public class WSSessionCancelActionClientEvent extends WSClientEvent {
-    public static final String ID = "cb_client_cancel_action";
-
-    @NotNull
-    private final String actionId;
-
-    public WSSessionCancelActionClientEvent(
-        @NotNull String actionId
-    ) {
-        super(ID, WSConstants.TOPIC_SESSION_ACTION);
-        this.actionId = actionId;
-    }
-
-    @NotNull
-    public String getActionId() {
-        return actionId;
-    }
-}

server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Community Product
 Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true
-Bundle-Version: 26.2.1.qualifier
-Bundle-Release-Date: 20260921
+Bundle-Version: 26.0.2.qualifier
+Bundle-Release-Date: 20260406
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.cloudbeaver.server.ce

server/bundles/io.cloudbeaver.product.ce/plugin.xml

@@ -16,10 +16,6 @@
         </product>
     </extension>
 
-    <extension point="io.cloudbeaver.feature">
-        <feature id="ai" label="AI Integration" description="Enables AI Chat in the application." enabledByDefault="true"/>
-    </extension>
-
     <extension point="org.jkiss.dbeaver.application">
         <application
                 id="cloudbeaver-ce"

server/bundles/io.cloudbeaver.product.ce/pom.xml

@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.product.ce</artifactId>
-    <version>26.2.1-SNAPSHOT</version>
+    <version>26.0.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF

@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloudbeaver Base JDBC drivers
 Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true
-Bundle-Version: 1.0.154.qualifier
-Bundle-Release-Date: 20260921
+Bundle-Version: 1.0.143.qualifier
+Bundle-Release-Date: 20260406
 Bundle-Vendor: DBeaver Corp
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: io.cloudbeaver.resources.drivers.base

server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml

@@ -14,9 +14,7 @@
         <resource name="drivers/jaybird"/>
         <resource name="drivers/h2"/>
         <resource name="drivers/h2_v2"/>
-        <resource name="drivers/h2_v3"/>
         <resource name="drivers/sqlite/xerial"/>
-        <resource name="drivers/libsql"/>
         <resource name="drivers/mssql/new"/>
         <resource name="drivers/trino"/>
         <resource name="drivers/kyuubi"/>
@@ -37,9 +35,7 @@
         <bundle id="drivers.firebird" label="Firebird drivers"/>
         <bundle id="drivers.h2" label="H2 drivers"/>
         <bundle id="drivers.h2_v2" label="H2 v2 drivers"/>
-        <bundle id="drivers.h2_v3" label="H2 v3 drivers"/>
         <bundle id="drivers.sqlite.xerial" label="SQLite drivers"/>
-        <bundle id="drivers.libsql" label="LibSQL drivers"/>
         <bundle id="drivers.mssql.new" label="SQL Server drivers"/>
         <bundle id="drivers.trino" label="Trino drivers"/>
         <bundle id="drivers.kyuubi" label="Apache Kyuubi drivers"/>
@@ -59,14 +55,13 @@
         <driver id="clickhouse:com_clickhouse"/>
         <driver id="h2:h2_embedded"/>
         <driver id="h2:h2_embedded_v2"/>
-        <driver id="h2:h2_embedded_v3"/>
         <driver id="sqlite:sqlite_jdbc"/>
         <driver id="sqlite:libsql_jdbc"/>
         <driver id="sqlserver:microsoft"/>
         <driver id="generic:trino_jdbc"/>
         <driver id="duckdb:duckdb_jdbc"/>
         <driver id="generic:kyuubi_hive"/>
-        <driver id="databend:databend_jdbc"/>
+        <driver id="databend:databend"/>
     </extension>
 
 

server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml

@@ -9,6 +9,6 @@
     <relativePath>../</relativePath>
   </parent>
   <artifactId>io.cloudbeaver.resources.drivers.base</artifactId>
-  <version>1.0.154-SNAPSHOT</version>
+  <version>1.0.143-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

server/bundles/io.cloudbeaver.server.ce/META-INF/MANIFEST.MF

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: CloudBeaver Community
 Bundle-SymbolicName: io.cloudbeaver.server.ce;singleton:=true
-Bundle-Version: 26.2.1.qualifier
-Bundle-Release-Date: 20260921
+Bundle-Version: 26.0.2.qualifier
+Bundle-Release-Date: 20260406
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator

server/bundles/io.cloudbeaver.server.ce/pom.xml

@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.server.ce</artifactId>
-    <version>26.2.1-SNAPSHOT</version>
+    <version>26.0.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.server.ce/schema/service.core.graphqls

@@ -1,7 +1,3 @@
-####################################################
-# Core API
-####################################################
-
 extend type ServerConfig {
     serverURL: String! @deprecated
     rootURI: String!

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 package io.cloudbeaver.server;
 
-import graphql.execution.instrumentation.Instrumentation;
 import io.cloudbeaver.WebServiceUtils;
 import io.cloudbeaver.auth.NoAuthCredentialsProvider;
 import io.cloudbeaver.model.CBWebServerConfig;
@@ -30,7 +29,6 @@ import io.cloudbeaver.model.config.CBAppConfig;
 import io.cloudbeaver.model.config.CBServerConfig;
 import io.cloudbeaver.registry.WebDriverRegistry;
 import io.cloudbeaver.registry.WebServiceRegistry;
-import io.cloudbeaver.server.graphql.GraphQLEndpoint;
 import io.cloudbeaver.server.jetty.CBJettyServer;
 import io.cloudbeaver.service.DBWServiceInitializer;
 import io.cloudbeaver.service.DBWServiceServerConfigurator;
@@ -47,14 +45,14 @@ import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBConstants;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
-import org.jkiss.dbeaver.model.auth.SMAuthConfiguration;
+import org.jkiss.dbeaver.model.auth.AuthInfo;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
-import org.jkiss.dbeaver.model.auth.SMObjectType;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
 import org.jkiss.dbeaver.model.security.SMAdminController;
 import org.jkiss.dbeaver.model.security.SMConstants;
+import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.websocket.event.WSEventController;
 import org.jkiss.dbeaver.model.websocket.event.WSServerConfigurationChangedEvent;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -181,7 +179,6 @@ public abstract class CBApplication<T extends CBServerConfig>
         return getServerConfigurationController().getServerConfiguration();
     }
 
-    @NotNull
     @Override
     public ServletAuthConfiguration getAuthConfiguration() {
         return getAppConfiguration();
@@ -229,11 +226,11 @@ public abstract class CBApplication<T extends CBServerConfig>
         Location instanceLoc = Platform.getInstanceLocation();
         try {
             if (!instanceLoc.isSet()) { // always false?
-                URL wsLocationURL = getWorkspacePath().toUri().toURL();
+                URL wsLocationURL = getWorkspaceDirectory().toUri().toURL();
                 instanceLoc.set(wsLocationURL, true);
             }
         } catch (Exception e) {
-            log.error("Error setting workspace location to " + getWorkspacePath().toAbsolutePath(), e);
+            log.error("Error setting workspace location to " + getWorkspaceDirectory().toAbsolutePath(), e);
             return;
         }
         this.systemInformationCollector = createSystemInformationCollector();
@@ -444,7 +441,7 @@ public abstract class CBApplication<T extends CBServerConfig>
 
     @NotNull
     public Path getDataDirectory(boolean create) {
-        Path dataDir = getWorkspacePath().resolve(CBConstants.RUNTIME_DATA_DIR_NAME);
+        Path dataDir = getWorkspaceDirectory().resolve(CBConstants.RUNTIME_DATA_DIR_NAME);
         if (create && !Files.exists(dataDir)) {
             try {
                 Files.createDirectories(dataDir);
@@ -535,7 +532,7 @@ public abstract class CBApplication<T extends CBServerConfig>
     public synchronized void finishConfiguration(
         @NotNull String adminName,
         @Nullable String adminPassword,
-        @NotNull List<SMAuthConfiguration> authInfoList,
+        @NotNull List<AuthInfo> authInfoList,
         @NotNull CBServerConfig serverConfig,
         @NotNull CBAppConfig appConfig,
         @Nullable SMCredentialsProvider credentialsProvider
@@ -592,7 +589,7 @@ public abstract class CBApplication<T extends CBServerConfig>
     protected abstract void finishSecurityServiceConfiguration(
         @NotNull String adminName,
         @Nullable String adminPassword,
-        @NotNull List<SMAuthConfiguration> authInfoList
+        @NotNull List<AuthInfo> authInfoList
     ) throws DBException;
 
     public synchronized void flushConfiguration(SMCredentialsProvider webSession) throws DBException {
@@ -688,11 +685,6 @@ public abstract class CBApplication<T extends CBServerConfig>
         return new CBSessionManager(this);
     }
 
-    @NotNull
-    public GraphQLEndpoint createGraphQLEndpoint(@NotNull Instrumentation instrumentation) {
-        return new GraphQLEndpoint(instrumentation);
-    }
-
     @NotNull
     public WebDriverRegistry getDriverRegistry() {
         return WebDriverRegistry.getInstance();
@@ -744,7 +736,7 @@ public abstract class CBApplication<T extends CBServerConfig>
         sendConfigChangedEvent(credentialsProvider);
     }
 
-    protected void sendConfigChangedEvent(@Nullable SMCredentialsProvider credentialsProvider) {
+    protected void sendConfigChangedEvent(SMCredentialsProvider credentialsProvider) {
         String sessionId = null;
         if (credentialsProvider != null && credentialsProvider.getActiveUserCredentials() != null) {
             sessionId = credentialsProvider.getActiveUserCredentials().getSmSessionId();
@@ -752,7 +744,6 @@ public abstract class CBApplication<T extends CBServerConfig>
         eventController.addEvent(new WSServerConfigurationChangedEvent(sessionId, null));
     }
 
-    @NotNull
     @Override
     public abstract CBServerConfigurationController<T> getServerConfigurationController();
 

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBFileController;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
-import org.jkiss.dbeaver.model.auth.SMAuthConfiguration;
+import org.jkiss.dbeaver.model.auth.AuthInfo;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.security.SMAdminController;
@@ -75,16 +75,13 @@ public class CBApplicationCE extends CBApplication<CBServerConfig> {
         );
     }
 
+
+
     @NotNull
     @Override
-    public RMController createResourceController(
-        @NotNull SMCredentialsProvider credentialsProvider,
-        @NotNull DBPWorkspace workspace
-    ) throws DBException {
-        var lockManager = createLockManager();
-        return LocalResourceController
-            .builder(credentialsProvider, workspace, lockManager, this::getSecurityController)
-            .build();
+    public RMController createResourceController(@NotNull SMCredentialsProvider credentialsProvider,
+                                                 @NotNull DBPWorkspace workspace) throws DBException {
+        return LocalResourceController.builder(credentialsProvider, workspace, this::getSecurityController).build();
     }
 
     @NotNull
@@ -93,7 +90,6 @@ public class CBApplicationCE extends CBApplication<CBServerConfig> {
         return new LocalFileController(DBWorkbench.getPlatform().getWorkspace().getAbsolutePath().resolve(DBFileController.DATA_FOLDER));
     }
 
-    @NotNull
     @Override
     public CBServerConfigurationControllerEmbedded<CBServerConfig> getServerConfigurationController() {
         return serverConfigController;
@@ -102,7 +98,7 @@ public class CBApplicationCE extends CBApplication<CBServerConfig> {
     protected void finishSecurityServiceConfiguration(
         @NotNull String adminName,
         @Nullable String adminPassword,
-        @NotNull List<SMAuthConfiguration> authInfoList
+        @NotNull List<AuthInfo> authInfoList
     ) throws DBException {
         if (securityController instanceof CBEmbeddedSecurityController<?> embeddedSecurityController) {
             embeddedSecurityController.finishConfiguration(adminName, adminPassword, authInfoList);

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import io.cloudbeaver.server.jobs.SessionStateJob;
 import io.cloudbeaver.server.jobs.WebDataSourceMonitorJob;
 import io.cloudbeaver.server.jobs.WebSessionMonitorJob;
 import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPRegistryListener;
 import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
@@ -52,7 +51,7 @@ public class CBPlatform extends BaseWebPlatform {
     }
 
     @Override
-    protected synchronized void initialize() throws DBException {
+    protected synchronized void initialize() {
         long startTime = System.currentTimeMillis();
         log.info("Initialize web platform " + getClass().getSimpleName());
         this.preferenceStore = new WebServerPreferenceStore(WebPlatformActivator.getInstance().getPreferences());

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2026 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,10 @@ import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import io.cloudbeaver.model.app.BaseServerConfigurationController;
 import io.cloudbeaver.model.app.BaseServletApplication;
-import io.cloudbeaver.model.config.*;
+import io.cloudbeaver.model.config.CBAppConfig;
+import io.cloudbeaver.model.config.CBServerConfig;
+import io.cloudbeaver.model.config.PasswordPolicyConfiguration;
+import io.cloudbeaver.model.config.SMControllerConfiguration;
 import io.cloudbeaver.utils.ServletAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
@@ -371,7 +374,6 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
         try (Writer out = new OutputStreamWriter(Files.newOutputStream(runtimeConfigPath), StandardCharsets.UTF_8)) {
             Gson gson = new GsonBuilder()
                 .setStrictness(Strictness.LENIENT)
-                .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
                 .setPrettyPrinting()
                 .create();
             gson.toJson(configurationProperties, out);
@@ -487,7 +489,6 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
                 }
             }
             appConfigProperties.put("enabledFeatures", Arrays.asList(appConfig.getEnabledFeatures()));
-            appConfigProperties.put("disabledFeatures", Arrays.asList(appConfig.getDisabledFeatures()));
             if (appConfig.getEnabledAuthProviders() != null) {
                 appConfigProperties.put("enabledAuthProviders", Arrays.asList(appConfig.getEnabledAuthProviders()));
             }
@@ -507,7 +508,7 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
     @NotNull
     protected Map<String, Object> collectServerConfigProperties(
         @NotNull CBServerConfig serverConfig,
-        @NotNull Map<String, Object> originServerConfig
+        Map<String, Object> originServerConfig
     ) {
         var serverConfigProperties = new LinkedHashMap<String, Object>();
         if (!CommonUtils.isEmpty(serverConfig.getServerName())) {
@@ -632,9 +633,6 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
         return serverConfiguration;
     }
 
-    @NotNull
-    public abstract CBServerConfigurationMapper<T, ? extends AdminServerConfig> createServerConfigurationInputMapper();
-
     public CBAppConfig getAppConfiguration() {
         return appConfiguration;
     }