CB-5790 remove template plugin

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

@@ -32,10 +32,8 @@
 public class WebConnectionConfig {
 
     private String connectionId;
-    private String templateId;
     private String driverId;
 
-    private boolean template;
     private boolean readOnly;
 
     private String host;
@@ -70,14 +68,7 @@ public WebConnectionConfig() {
     public WebConnectionConfig(Map<String, Object> params) {
         if (!CommonUtils.isEmpty(params)) {
             connectionId = JSONUtils.getString(params, "connectionId");
-            templateId = JSONUtils.getString(params, "templateId");
-            String dataSourceId = JSONUtils.getString(params, "dataSourceId");
-            if (CommonUtils.isEmpty(templateId) && !CommonUtils.isEmpty(dataSourceId)) {
-                templateId = dataSourceId;
-            }
             driverId = JSONUtils.getString(params, "driverId");
-
-            template = JSONUtils.getBoolean(params, "template");
             readOnly = JSONUtils.getBoolean(params, "readOnly");
 
             host = JSONUtils.getString(params, "host");
@@ -121,21 +112,11 @@ public String getConnectionId() {
         return connectionId;
     }
 
-    @Property
-    public String getTemplateId() {
-        return templateId;
-    }
-
     @Property
     public String getDriverId() {
         return driverId;
     }
 
-    @Property
-    public boolean isTemplate() {
-        return template;
-    }
-
     @Property
     public boolean isReadOnly() {
         return readOnly;

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

@@ -171,11 +171,6 @@ public boolean isConnected() {
         return dataSourceContainer.isConnected();
     }
 
-    @Property
-    public boolean isTemplate() {
-        return dataSourceContainer.isTemplate();
-    }
-
     @Property
     public boolean isProvided() {
         return dataSourceContainer.isProvided();

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

@@ -357,7 +357,6 @@ type ConnectionInfo {
 
     properties: Object
 
-    template: Boolean! @deprecated
     connected: Boolean!
     provided: Boolean!
     readOnly: Boolean!
@@ -502,8 +501,6 @@ input ConnectionConfig {
     name: String
     description: String
 
-    # ID of template connection
-    templateId: ID @deprecated
     # ID of database driver
     driverId: ID
 
@@ -529,8 +526,6 @@ input ConnectionConfig {
     # Return auto-commit connection state
     autocommit: Boolean
 
-    # Return template connection state
-    template: Boolean @deprecated
     # Return read-only connection state
     readOnly: Boolean
 
@@ -590,9 +585,6 @@ extend type Query {
     # Return list of user connections
     userConnections( projectId: ID, id: ID, projectIds: [ID!] ): [ ConnectionInfo! ]!
 
-    # Return list of template connections by project ID
-    templateConnections( projectId: ID ): [ ConnectionInfo! ]! @deprecated
-
     # List of connection folders
     connectionFolders( projectId: ID, path: ID ): [ ConnectionFolderInfo! ]!
 
@@ -632,9 +624,6 @@ extend type Mutation {
     # Delete specified connection
     deleteConnection( id: ID!, projectId: ID ): Boolean!
 
-    # Create new custom connection from template
-    createConnectionFromTemplate( templateId: ID!, projectId: ID!, connectionName: String ): ConnectionInfo! @deprecated
-
     # Create new folder for connections
     createConnectionFolder(parentFolderPath: ID, folderName: String!, projectId: ID ): ConnectionFolderInfo!
 

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

@@ -106,16 +106,10 @@
         return WebServiceUtils.class.getClassLoader().getResourceAsStream(path);
     }
 
     @NotNull
     public static DBPDataSourceContainer createConnectionFromConfig(WebConnectionConfig config, DBPDataSourceRegistry registry) throws DBWebException {
         DBPDataSourceContainer newDataSource;
-        if (!CommonUtils.isEmpty(config.getTemplateId())) {
-            DBPDataSourceContainer tpl = registry.getDataSource(config.getTemplateId());
-            if (tpl == null) {
-                throw new DBWebException("Template connection '" + config.getTemplateId() + "' not found");
-            }
-            newDataSource = registry.createDataSource(tpl);
-        } else if (!CommonUtils.isEmpty(config.getDriverId())) {
+        if (!CommonUtils.isEmpty(config.getDriverId())) {
             String driverId = config.getDriverId();
             if (CommonUtils.isEmpty(driverId)) {
                 throw new DBWebException("Driver not specified");
@@ -138,7 +132,6 @@
         if (config.getFolder() != null) {
             newDataSource.setFolder(registry.getFolder(config.getFolder()));
         }
-        ((DataSourceDescriptor)newDataSource).setTemplate(config.isTemplate());
 
         ServletApplication app = ServletAppUtils.getServletApplication();
         if (app instanceof WebApplication webApplication) {

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

@@ -72,10 +72,6 @@ public DBPDataSourceContainer createDataSourceContainer(
         webSession.addInfoMessage("Create new connection");
         DBPDataSourceRegistry sessionRegistry = project.getDataSourceRegistry();
 
-        // we don't need to save credentials for templates
-        if (connectionConfig.isTemplate()) {
-            connectionConfig.setSaveCredentials(false);
-        }
         DBPDataSourceContainer newDataSource = WebServiceUtils.createConnectionFromConfig(connectionConfig,
             sessionRegistry);
         if (CommonUtils.isEmpty(newDataSource.getName())) {

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

@@ -70,14 +70,7 @@
     List<WebConnectionFolderInfo> getConnectionFolders(
         @NotNull WebSession webSession, @Nullable String projectId, @Nullable String id) throws DBWebException;
 
-    @Deprecated
-    @WebAction
-    List<WebDataSourceConfig> getTemplateDataSources() throws DBWebException;
-
-    @WebAction
-    List<WebConnectionInfo> getTemplateConnections(@NotNull WebSession webSession, @Nullable String projectId) throws DBWebException;
-
     @WebAction(authRequired = false)
     String[] getSessionPermissions(@NotNull WebSession webSession) throws DBWebException;
 
     ///////////////////////////////////////////
@@ -151,15 +144,7 @@
         @Nullable @WebObjectId String projectId,
         @NotNull String connectionId) throws DBWebException;
 
-    @WebAction
-    @Deprecated
-    WebConnectionInfo createConnectionFromTemplate(
-        @NotNull WebSession webSession,
-        @NotNull String projectId,
-        @NotNull String templateId,
-        @Nullable String connectionName) throws DBWebException;
-
     @WebProjectAction(requireProjectPermissions = {RMConstants.PERMISSION_PROJECT_DATASOURCES_EDIT})
     WebConnectionInfo copyConnectionFromNode(
         @NotNull WebSession webSession,
         @Nullable @WebObjectId String projectId,

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

@@ -59,11 +59,8 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
             .dataFetcher("driverList", env -> getService(env).getDriverList(getWebSession(env), env.getArgument("id")))
             .dataFetcher("authModels", env -> getService(env).getAuthModels(getWebSession(env)))
             .dataFetcher("networkHandlers", env -> getService(env).getNetworkHandlers(getWebSession(env)))
-            .dataFetcher("templateDataSources", env -> getService(env).getTemplateDataSources())
             .dataFetcher("userConnections", env -> getService(env).getUserConnections(
                 getWebSession(env), getProjectReference(env), env.getArgument("id"), env.getArgument("projectIds")))
-            .dataFetcher("templateConnections", env -> getService(env).getTemplateConnections(
-                getWebSession(env), getProjectReference(env)))
 
             .dataFetcher("connectionFolders", env -> getService(env).getConnectionFolders(
                 getWebSession(env), getProjectReference(env), env.getArgument("path")))
@@ -113,11 +110,6 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
                 getWebSession(env), getProjectReference(env), getConnectionConfig(env)))
             .dataFetcher("deleteConnection", env -> getService(env).deleteConnection(
                 getWebSession(env), getProjectReference(env), env.getArgument("id")))
-            .dataFetcher("createConnectionFromTemplate", env -> getService(env).createConnectionFromTemplate(
-                getWebSession(env),
-                getProjectReference(env),
-                env.getArgument("templateId"),
-                env.getArgument("connectionName")))
             .dataFetcher("copyConnectionFromNode", env -> getService(env).copyConnectionFromNode(
                 getWebSession(env),
                 getProjectReference(env),

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

@@ -131,58 +131,6 @@ public List<WebConnectionInfo> getUserConnections(
             .toList();
     }
 
-    @Deprecated
-    @Override
-    public List<WebDataSourceConfig> getTemplateDataSources() throws DBWebException {
-
-        List<WebDataSourceConfig> result = new ArrayList<>();
-        DBPDataSourceRegistry dsRegistry = WebServiceUtils.getGlobalDataSourceRegistry();
-
-        for (DBPDataSourceContainer ds : dsRegistry.getDataSources()) {
-            if (ds.isTemplate()) {
-                if (WebAppUtils.getWebApplication().getDriverRegistry().getApplicableDrivers().contains(ds.getDriver())) {
-                    result.add(new WebDataSourceConfig(ds));
-                } else {
-                    log.debug("Template datasource '" + ds.getName() + "' ignored - driver is not applicable");
-                }
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    public List<WebConnectionInfo> getTemplateConnections(
-        @NotNull WebSession webSession, @Nullable String projectId
-    ) throws DBWebException {
-        if (webSession.getApplication().isDistributed()) {
-            return List.of();
-        }
-        List<WebConnectionInfo> result = new ArrayList<>();
-        if (projectId == null) {
-            for (WebSessionProjectImpl project : webSession.getAccessibleProjects()) {
-                getTemplateConnectionsFromProject(webSession, project, result);
-            }
-        } else {
-            WebSessionProjectImpl project = getProjectById(webSession, projectId);
-            getTemplateConnectionsFromProject(webSession, project, result);
-        }
-        return result;
-    }
-
-    private void getTemplateConnectionsFromProject(
-        @NotNull WebSession webSession,
-        @NotNull WebSessionProjectImpl project,
-        List<WebConnectionInfo> result
-    ) {
-        DBPDataSourceRegistry registry = project.getDataSourceRegistry();
-        for (DBPDataSourceContainer ds : registry.getDataSources()) {
-            if (ds.isTemplate() && WebAppUtils.getWebApplication().getDriverRegistry().getApplicableDrivers().contains(ds.getDriver())) {
-                result.add(new WebConnectionInfo(webSession, ds));
-            }
-        }
-    }
-
     @Override
     public List<WebConnectionFolderInfo> getConnectionFolders(
         @NotNull WebSession webSession, @Nullable String projectId, @Nullable String id
@@ -400,44 +348,6 @@ public boolean deleteConnection(
 
     }
 
-    @Override
-    @Deprecated
-    public WebConnectionInfo createConnectionFromTemplate(
-        @NotNull WebSession webSession,
-        @NotNull String projectId,
-        @NotNull String templateId,
-        @Nullable String connectionName
-    ) throws DBWebException {
-        WebSessionProjectImpl project = getProjectById(webSession, projectId);
-        DBPDataSourceRegistry templateRegistry = project.getDataSourceRegistry();
-        DBPDataSourceContainer dataSourceTemplate = templateRegistry.getDataSource(templateId);
-        if (dataSourceTemplate == null) {
-            throw new DBWebException("Template data source '" + templateId + "' not found");
-        }
-
-        DBPDataSourceRegistry projectRegistry = webSession.getSingletonProject().getDataSourceRegistry();
-        DBPDataSourceContainer newDataSource = projectRegistry.createDataSource(dataSourceTemplate);
-
-        ServletApplication app = ServletAppUtils.getServletApplication();
-        if (app instanceof WebApplication webApplication) {
-            ((DataSourceDescriptor) newDataSource).setNavigatorSettings(
-                webApplication.getAppConfiguration().getDefaultNavigatorSettings());
-        }
-
-        if (!CommonUtils.isEmpty(connectionName)) {
-            newDataSource.setName(connectionName);
-        }
-        try {
-            projectRegistry.addDataSource(newDataSource);
-
-            projectRegistry.checkForErrors();
-        } catch (DBException e) {
-            throw new DBWebException(e.getMessage(), e);
-        }
-
-        return project.addConnection(newDataSource);
-    }
-
     @Override
     public WebConnectionInfo copyConnectionFromNode(
         @NotNull WebSession webSession,

webapp/packages/core-connections/src/ConnectionInfoResource.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -254,7 +254,6 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
 
     makeObservable<this, 'nodeIdMap'>(this, {
       nodeIdMap: observable,
-      createFromTemplate: action,
       create: action,
       createFromNode: action,
       add: action,
@@ -272,7 +271,6 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
 
   getEmptyConfig(): ConnectionConfig {
     return {
-      template: false,
       saveCredentials: false,
     };
   }
@@ -363,17 +361,6 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
     return this.add(connection);
   }
 
-  async createFromTemplate(projectId: string, templateId: string, connectionName: string): Promise<Connection> {
-    const { connection } = await this.graphQLService.sdk.createConnectionFromTemplate({
-      projectId,
-      templateId,
-      connectionName,
-      ...this.getDefaultIncludes(),
-      ...this.getIncludesMap(),
-    });
-    return this.add(connection);
-  }
-
   // addList(connections: Connection[]): Connection[] {
   //   const newConnections = connections.filter(connection => !this.has({
   //     projectId: connection.projectId,

webapp/packages/core-connections/src/locales/de.ts

@@ -7,12 +7,9 @@
  */
 export default [
   ['core_connections_connections_settings_group', 'Verbindungen'],
-  ['connections_administration_new_connection', 'Neue Verbindung'],
-  ['connections_administration_connection_access_empty', 'Keine verfügbaren Benutzer und Teams'],
-  ['connections_administration_configuration_wizard_step_title', 'Datenbankverbindungen'],
-  ['connections_administration_configuration_wizard_step_description', 'Datenbankverbindungen hinzufügen'],
-  ['connections_administration_configuration_wizard_title', 'Datenbankverbindungen hinzufügen'],
-  ['connections_administration_connection_no_information', 'Keine Information verfügbar'],
+  ['core_connections_new_connection', 'Neue Verbindung'],
+  ['core_connections_connection_access_empty', 'Keine verfügbaren Benutzer und Teams'],
+  ['core_connections_connection_no_information', 'Keine Information verfügbar'],
   ['connections_administration_delete_confirmation', 'Sie werden diese Verbindungen löschen: '],
   ['connections_administration_tools_delete_tooltip', 'Löschen Sie ausgewählte Verbindungen'],
   ['connections_administration_tools_refresh_success', 'Die Verbindungsliste wurde aktualisiert'],
@@ -59,7 +56,6 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
-  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
   ['core_connections_connection_driver_not_installed', 'Driver is not installed'],
   ['core_connections_connection_temporary', 'Temporary connection'],
 ];