Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
568a8c86
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
568a8c86
编写于
10月 25, 2020
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CB-430 Auth model refactoring
上级
8a4daf43
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
12 deletion
+10
-12
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceConfigurationStorage.java
...kiss/dbeaver/model/DBPDataSourceConfigurationStorage.java
+0
-3
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/auth/DBAAuthCredentialsProvider.java
.../jkiss/dbeaver/model/auth/DBAAuthCredentialsProvider.java
+8
-2
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
.../src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+1
-1
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
...ry/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
+1
-1
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceStorage.java
...try/src/org/jkiss/dbeaver/registry/DataSourceStorage.java
+0
-5
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceConfigurationStorage.java
浏览文件 @
568a8c86
...
...
@@ -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
)
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/auth/DBAAuthCredentialsProvider.java
浏览文件 @
568a8c86
...
...
@@ -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
;
}
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @
568a8c86
...
...
@@ -618,7 +618,7 @@ public class DataSourceDescriptor
@Override
public
boolean
isExternallyProvided
()
{
return
storage
.
isDynamic
();
return
origin
.
isDynamic
();
}
@Override
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
浏览文件 @
568a8c86
...
...
@@ -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
);
}
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceStorage.java
浏览文件 @
568a8c86
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录