opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-2464 de save data sources remotely fix (#1081)

Browse Source 
* CB-2464 de save data sources remotely fix

* CB-2464 add data source persistence registry
This commit is contained in:
Ainur
2022-08-31 11:00:07 +03:00
committed by GitHub
parent 94c8fa0cd6
commit 47bb280cf3
5 changed files with 259 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/VirtualProjectImpl.java
+3 -2
View File
@@ -20,6 +20,7 @@ import io.cloudbeaver.model.rm.RMUtils;
import org.eclipse.core.resources.IProject;
import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
import org.jkiss.dbeaver.model.auth.SMSessionContext;
import org.jkiss.dbeaver.model.rm.RMProject;
import org.jkiss.dbeaver.registry.BaseProjectImpl;
@@ -93,7 +94,7 @@ public class VirtualProjectImpl extends BaseProjectImpl {
@NotNull
@Override
protected DataSourceRegistry createDataSourceRegistry() {
return new WebDataSourceRegistryProxy(super.createDataSourceRegistry(), dataSourceFilter);
protected DBPDataSourceRegistry createDataSourceRegistry() {
return new WebDataSourceRegistryProxy(new DataSourceRegistry(this), dataSourceFilter);
}
}
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java
+246 -13
View File
@@ -7,30 +7,40 @@ import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.*;
import org.jkiss.dbeaver.model.access.DBAAuthProfile;
import org.jkiss.dbeaver.model.access.DBACredentialsProvider;
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.DBPDriver;
import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceFolder;
import org.jkiss.dbeaver.registry.DataSourceConfigurationManager;
import org.jkiss.dbeaver.registry.DataSourcePersistentRegistry;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
public class WebDataSourceRegistryProxy extends DataSourceRegistry {
public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSourcePersistentRegistry {
private final DataSourceFilter dataSourceFilter;
private final DataSourceRegistry dataSourceRegistry;
public WebDataSourceRegistryProxy(DataSourceRegistry dataSourceRegistry, DataSourceFilter filter) {
super(dataSourceRegistry.getProject());
this.dataSourceRegistry = dataSourceRegistry;
this.dataSourceFilter = filter;
}
@Override
public DBPProject getProject() {
return dataSourceRegistry.getProject();
}
@Nullable
@Override
public DataSourceDescriptor getDataSource(String id) {
DataSourceDescriptor dataSource = super.getDataSource(id);
public DBPDataSourceContainer getDataSource(String id) {
DBPDataSourceContainer dataSource = dataSourceRegistry.getDataSource(id);
if (dataSourceFilter != null && !dataSourceFilter.filter(dataSource)) {
return null;
}
@@ -39,17 +49,17 @@ public class WebDataSourceRegistryProxy extends DataSourceRegistry {
@Nullable
@Override
public DataSourceDescriptor getDataSource(DBPDataSource dataSource) {
public DBPDataSourceContainer getDataSource(DBPDataSource dataSource) {
if (dataSourceFilter != null && !dataSourceFilter.filter(dataSource.getContainer())) {
return null;
}
return super.getDataSource(dataSource);
return dataSourceRegistry.getDataSource(dataSource);
}
@Nullable
@Override
public DataSourceDescriptor findDataSourceByName(String name) {
var dataSource = super.findDataSourceByName(name);
public DBPDataSourceContainer findDataSourceByName(String name) {
var dataSource = dataSourceRegistry.findDataSourceByName(name);
if (dataSource != null) {
if (dataSourceFilter == null || dataSourceFilter.filter(dataSource)) {
return dataSource;
@@ -61,7 +71,7 @@ public class WebDataSourceRegistryProxy extends DataSourceRegistry {
@NotNull
@Override
public List<? extends DBPDataSourceContainer> getDataSourcesByProfile(@NotNull DBWNetworkProfile profile) {
return super.getDataSourcesByProfile(profile)
return dataSourceRegistry.getDataSourcesByProfile(profile)
.stream()
.filter(dataSourceFilter::filter)
.collect(Collectors.toList());
@@ -69,10 +79,233 @@ public class WebDataSourceRegistryProxy extends DataSourceRegistry {
@NotNull
@Override
public List<DataSourceDescriptor> getDataSources() {
return super.getDataSources()
public List<DBPDataSourceContainer> getDataSources() {
return dataSourceRegistry.getDataSources()
.stream()
.filter(dataSourceFilter::filter)
.collect(Collectors.toList());
}
@NotNull
@Override
public DBPDataSourceContainer createDataSource(DBPDriver driver, DBPConnectionConfiguration connConfig) {
return dataSourceRegistry.createDataSource(driver, connConfig);
}
@NotNull
@Override
public DBPDataSourceContainer createDataSource(DBPDataSourceContainer source) {
return dataSourceRegistry.createDataSource(source);
}
@Override
public void addDataSourceListener(@NotNull DBPEventListener listener) {
dataSourceRegistry.addDataSourceListener(listener);
}
@Override
public boolean removeDataSourceListener(@NotNull DBPEventListener listener) {
return dataSourceRegistry.removeDataSourceListener(listener);
}
@Override
public void addDataSource(@NotNull DBPDataSourceContainer dataSource) {
dataSourceRegistry.addDataSource(dataSource);
}
@Override
public void removeDataSource(@NotNull DBPDataSourceContainer dataSource) {
dataSourceRegistry.removeDataSource(dataSource);
}
@Override
public void updateDataSource(@NotNull DBPDataSourceContainer dataSource) {
dataSourceRegistry.updateDataSource(dataSource);
}
@NotNull
@Override
public List<? extends DBPDataSourceFolder> getAllFolders() {
return dataSourceRegistry.getAllFolders();
}
@NotNull
@Override
public List<? extends DBPDataSourceFolder> getRootFolders() {
return dataSourceRegistry.getRootFolders();
}
@Override
public DBPDataSourceFolder getFolder(String path) {
return dataSourceRegistry.getFolder(path);
}
@Override
public DBPDataSourceFolder addFolder(DBPDataSourceFolder parent, String name) {
return dataSourceRegistry.addFolder(parent, name);
}
@Override
public void removeFolder(DBPDataSourceFolder folder, boolean dropContents) {
dataSourceRegistry.removeFolder(folder, dropContents);
}
@Nullable
@Override
public DBSObjectFilter getSavedFilter(String name) {
return dataSourceRegistry.getSavedFilter(name);
}
@NotNull
@Override
public List<DBSObjectFilter> getSavedFilters() {
return dataSourceRegistry.getSavedFilters();
}
@Override
public void updateSavedFilter(DBSObjectFilter filter) {
dataSourceRegistry.updateSavedFilter(filter);
}
@Override
public void removeSavedFilter(String filterName) {
dataSourceRegistry.removeSavedFilter(filterName);
}
@Nullable
@Override
public DBWNetworkProfile getNetworkProfile(String name) {
return dataSourceRegistry.getNetworkProfile(name);
}
@NotNull
@Override
public List<DBWNetworkProfile> getNetworkProfiles() {
return dataSourceRegistry.getNetworkProfiles();
}
@Override
public void updateNetworkProfile(DBWNetworkProfile profile) {
dataSourceRegistry.updateNetworkProfile(profile);
}
@Override
public void removeNetworkProfile(DBWNetworkProfile profile) {
dataSourceRegistry.removeNetworkProfile(profile);
}
@Nullable
@Override
public DBAAuthProfile getAuthProfile(String id) {
return dataSourceRegistry.getAuthProfile(id);
}
@NotNull
@Override
public List<DBAAuthProfile> getAllAuthProfiles() {
return dataSourceRegistry.getAllAuthProfiles();
}
@NotNull
@Override
public List<DBAAuthProfile> getApplicableAuthProfiles(@Nullable DBPDriver driver) {
return dataSourceRegistry.getApplicableAuthProfiles(driver);
}
@Override
public void updateAuthProfile(DBAAuthProfile profile) {
dataSourceRegistry.updateAuthProfile(profile);
}
@Override
public void removeAuthProfile(DBAAuthProfile profile) {
dataSourceRegistry.removeAuthProfile(profile);
}
@Override
public void flushConfig() {
dataSourceRegistry.flushConfig();
}
@Override
public void refreshConfig() {
dataSourceRegistry.refreshConfig();
}
@Override
public Throwable getLastError() {
return dataSourceRegistry.getLastError();
}
@Override
public boolean hasError() {
return dataSourceRegistry.hasError();
}
@Override
public void checkForErrors() throws DBException {
dataSourceRegistry.checkForErrors();
}
@Override
public void notifyDataSourceListeners(DBPEvent event) {
dataSourceRegistry.notifyDataSourceListeners(event);
}
@NotNull
@Override
public ISecurePreferences getSecurePreferences() {
return dataSourceRegistry.getSecurePreferences();
}
@Nullable
@Override
public DBACredentialsProvider getAuthCredentialsProvider() {
return dataSourceRegistry.getAuthCredentialsProvider();
}
@Override
public void dispose() {
dataSourceRegistry.dispose();
}
@Override
public void setAuthCredentialsProvider(DBACredentialsProvider authCredentialsProvider) {
dataSourceRegistry.setAuthCredentialsProvider(authCredentialsProvider);
}
@Override
public Set<DBPDataSourceFolder> getTemporaryFolders() {
return dataSourceRegistry.getTemporaryFolders();
}
@Override
public void loadDataSources(
@NotNull List<DBPDataSourceConfigurationStorage> storages,
@NotNull DataSourceConfigurationManager manager,
boolean refresh,
boolean purgeUntouched
) {
dataSourceRegistry.loadDataSources(storages, manager, refresh, purgeUntouched);
}
@Override
public void saveDataSources() {
dataSourceRegistry.saveDataSources();
}
@Override
public DataSourceConfigurationManager getConfigurationManager() {
return dataSourceRegistry.getConfigurationManager();
}
@Override
public void saveConfigurationToManager(
@NotNull DBRProgressMonitor monitor,
@NotNull DataSourceConfigurationManager configurationManager,
@Nullable Predicate<DBPDataSourceContainer> filter
) {
dataSourceRegistry.saveConfigurationToManager(monitor, configurationManager, filter);
}
}
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
+7 -6
View File
@@ -27,6 +27,7 @@ import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.DBPDataSourceConfigurationStorage;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
import org.jkiss.dbeaver.model.app.DBPProject;
import org.jkiss.dbeaver.model.auth.SMCredentials;
@@ -259,7 +260,7 @@ public class LocalResourceController implements RMController {
DBPDataSourceRegistry registry = projectMetadata.getDataSourceRegistry();
registry.checkForErrors();
DataSourceConfigurationManagerBuffer buffer = new DataSourceConfigurationManagerBuffer();
((DataSourceRegistry)registry).saveConfigurationToManager(new VoidProgressMonitor(), buffer, null);
((DataSourcePersistentRegistry) registry).saveConfigurationToManager(new VoidProgressMonitor(), buffer, null);
registry.checkForErrors();
return new String(buffer.getData(), StandardCharsets.UTF_8);
}
@@ -267,22 +268,22 @@ public class LocalResourceController implements RMController {
@Override
public void saveProjectDataSources(@NotNull String projectId, @NotNull String configuration) throws DBException {
final DBPProject project = getProjectMetadata(projectId);
final DataSourceRegistry registry = (DataSourceRegistry) project.getDataSourceRegistry();
final DBPDataSourceRegistry registry = project.getDataSourceRegistry();
final DBPDataSourceConfigurationStorage storage = new DataSourceMemoryStorage(configuration.getBytes(StandardCharsets.UTF_8));
final DataSourceConfigurationManager manager = new DataSourceConfigurationManagerBuffer();
registry.loadDataSources(List.of(storage), manager, true, false);
((DataSourcePersistentRegistry) registry).loadDataSources(List.of(storage), manager, true, false);
registry.checkForErrors();
registry.saveDataSources();
((DataSourcePersistentRegistry) registry).saveDataSources();
registry.checkForErrors();
}
@Override
public void deleteProjectDataSources(@NotNull String projectId, @NotNull String[] dataSourceIds) throws DBException {
final DBPProject project = getProjectMetadata(projectId);
final DataSourceRegistry registry = (DataSourceRegistry) project.getDataSourceRegistry();
final DBPDataSourceRegistry registry = project.getDataSourceRegistry();
for (String dataSourceId : dataSourceIds) {
final DataSourceDescriptor dataSource = registry.getDataSource(dataSourceId);
final DBPDataSourceContainer dataSource = registry.getDataSource(dataSourceId);
if (dataSource != null) {
registry.removeDataSource(dataSource);
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+2 -5
View File
@@ -16,10 +16,7 @@
*/
package io.cloudbeaver.model.session;
import io.cloudbeaver.DBWConstants;
import io.cloudbeaver.DBWebException;
import io.cloudbeaver.DataSourceFilter;
import io.cloudbeaver.VirtualProjectImpl;
import io.cloudbeaver.*;
import io.cloudbeaver.model.WebAsyncTaskInfo;
import io.cloudbeaver.model.WebConnectionInfo;
import io.cloudbeaver.model.WebServerMessage;
@@ -366,7 +363,7 @@ public class WebSession extends AbstractSessionPersistent implements SMSession,
this,
filter);
DBPDataSourceRegistry dataSourceRegistry = sessionProject.getDataSourceRegistry();
((DataSourceRegistry) dataSourceRegistry).setAuthCredentialsProvider(this);
dataSourceRegistry.setAuthCredentialsProvider(this);
addSessionProject(sessionProject);
if (!project.isShared() || application.isConfigurationMode()) {
this.defaultProject = sessionProject;
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java
+1 -1
View File
@@ -160,7 +160,7 @@ public class WebNavigatorNodeInfo {
} else if (node instanceof DBNLocalFolder) {
DataSourceFolder folder = (DataSourceFolder) ((DBNLocalFolder) node).getFolder();
String projectName = folder.getDataSourceRegistry().getProject().getName();
Set<DBPDataSourceFolder> tempFolders = ((DataSourceRegistry) folder.getDataSourceRegistry()).getTemporaryFolders();
Set<DBPDataSourceFolder> tempFolders = folder.getDataSourceRegistry().getTemporaryFolders();
isShared = !projectName.equals(session.getUserId()) || tempFolders.contains(folder);
}
if (isShared) {