提交 568a8c86 编写于 作者: S serge-rider

CB-430 Auth model refactoring

上级 8a4daf43
......@@ -33,9 +33,6 @@ public interface DBPDataSourceConfigurationStorage {
boolean isDefault();
// Datasources provided by some dynamic service (e.gl. cloud)
boolean isDynamic();
String getStatus();
List<? extends DBPDataSourceContainer> loadDataSources(DBPDataSourceRegistry registry, Map<String, Object> options)
......
......@@ -17,14 +17,20 @@
package org.jkiss.dbeaver.model.auth;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
/**
* Auth credentials.
* Auth credentials provider.
*/
public interface DBAAuthCredentialsProvider {
boolean provideAuthParameters(DBPDataSourceContainer dataSourceContainer, DBPConnectionConfiguration configuration);
/**
* Fill credential parameters in the specified container and configuration.
* Returns false on auth cancel. True otherwise.
*/
boolean provideAuthParameters(DBPDataSourceContainer dataSourceContainer, DBPConnectionConfiguration configuration)
throws DBException;
}
......@@ -618,7 +618,7 @@ public class DataSourceDescriptor
@Override
public boolean isExternallyProvided() {
return storage.isDynamic();
return origin.isDynamic();
}
@Override
......
......@@ -680,7 +680,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry {
List<DataSourceDescriptor> removedDataSource = new ArrayList<>();
for (DataSourceDescriptor ds : dataSources.values()) {
if (!parseResults.addedDataSources.contains(ds) && !parseResults.updatedDataSources.contains(ds) &&
!ds.isProvided() && !ds.getStorage().isDynamic() && !ds.isDetached())
!ds.isProvided() && !ds.isExternallyProvided() && !ds.isDetached())
{
removedDataSource.add(ds);
}
......
......@@ -78,11 +78,6 @@ class DataSourceStorage implements DBPDataSourceConfigurationStorage
return isDefault;
}
@Override
public boolean isDynamic() {
return false;
}
public File getSourceFile() {
return sourceFile;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册