Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 11a72b43 编写于 作者: S Serge Rider
浏览文件
操作

Connection provider properties refactoring

上级 ceb78b45
隐藏空白更改
内联 并排
Showing with 40 addition and 40 deletion
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
浏览文件 @ 11a72b43
......@@ -691,7 +691,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
xml.addAttribute(RegistryConstants.ATTR_VALUE, CommonUtils.toString(entry.getValue()));
xml.endElement();
}
for (Map.Entry<Object, Object> entry : connectionInfo.getProviderProperties().entrySet()) {
for (Map.Entry<String, String> entry : connectionInfo.getProviderProperties().entrySet()) {
xml.startElement(RegistryConstants.TAG_PROVIDER_PROPERTY);
xml.addAttribute(RegistryConstants.ATTR_NAME, CommonUtils.toString(entry.getKey()));
xml.addAttribute(RegistryConstants.ATTR_VALUE, CommonUtils.toString(entry.getValue()));
......
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/DB2DataSourceProvider.java
浏览文件 @ 11a72b43
......@@ -77,7 +77,7 @@ public class DB2DataSourceProvider extends JDBCDataSourceProvider {
if (!CommonUtils.isEmpty(connectionInfo.getDatabaseName())) {
url.append(connectionInfo.getDatabaseName());
}
Map<Object, Object> properties = connectionInfo.getProviderProperties();
Map<String, String> properties = connectionInfo.getProviderProperties();
boolean traceEnabled = CommonUtils.getBoolean(properties.get(DB2Constants.PROP_TRACE_ENABLED), false);
if (traceEnabled) {
url.append(":traceDirectory=").append(CommonUtils.toString(properties.get(DB2Constants.PROP_TRACE_FOLDER)));
......
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionTracePage.java
浏览文件 @ 11a72b43
......@@ -146,7 +146,7 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
{
// Load values from new connection info
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
Map<Object,Object> providerProperties = connectionInfo.getProviderProperties();
Map<String, String> providerProperties = connectionInfo.getProviderProperties();
// Settings
enableTraceCheck.setSelection(
......@@ -179,20 +179,20 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
public void saveSettings(DBPDataSourceContainer dataSource)
{
super.saveSettings(dataSource);
Map<Object, Object> providerProperties = dataSource.getConnectionConfiguration().getProviderProperties();
Map<String, String> providerProperties = dataSource.getConnectionConfiguration().getProviderProperties();
{
providerProperties.put(DB2Constants.PROP_TRACE_ENABLED, enableTraceCheck.getSelection());
providerProperties.put(DB2Constants.PROP_TRACE_ENABLED, String.valueOf(enableTraceCheck.getSelection()));
providerProperties.put(DB2Constants.PROP_TRACE_FOLDER, folderText.getText());
providerProperties.put(DB2Constants.PROP_TRACE_FILE, fileNameText.getText());
providerProperties.put(DB2Constants.PROP_TRACE_APPEND, traceAppendCheck.getSelection());
providerProperties.put(DB2Constants.PROP_TRACE_APPEND, String.valueOf(traceAppendCheck.getSelection()));
int traceLevel = 0;
for (LevelConfig level : levels) {
if (level.checkbox.getSelection()) {
traceLevel |= level.level;
}
}
providerProperties.put(DB2Constants.PROP_TRACE_LEVEL, traceLevel);
providerProperties.put(DB2Constants.PROP_TRACE_LEVEL, String.valueOf(traceLevel));
}
saveConnectionURL(dataSource.getConnectionConfiguration());
}
......
plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolDataSourceProvider.java
浏览文件 @ 11a72b43
......@@ -74,7 +74,7 @@ public class ExasolDataSourceProvider extends JDBCDataSourceProvider {
url.append("jdbc:exa:").append(connectionInfo.getHostName()).append(port);
//check if we got an backup host list
Object backupHostList = connectionInfo.getProviderProperty(ExasolConstants.DRV_BACKUP_HOST_LIST);
String backupHostList = connectionInfo.getProviderProperty(ExasolConstants.DRV_BACKUP_HOST_LIST);
if (backupHostList != null)
url.append(",").append(backupHostList).append(port);
......@@ -85,7 +85,7 @@ public class ExasolDataSourceProvider extends JDBCDataSourceProvider {
Object propClientName = properties.get(ExasolConstants.DRV_CLIENT_NAME);
if (propClientName != null)
clientName = propClientName.toString();
url.append(";clientname=" + clientName);
url.append(";clientname=").append(clientName);
}
Object querytimeout = properties.get(ExasolConstants.DRV_QUERYTIMEOUT);
if (querytimeout != null)
......
plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/views/ExasolConnectionPage.java
浏览文件 @ 11a72b43
......@@ -203,19 +203,19 @@ public class ExasolConnectionPage extends ConnectionPageAbstract implements ICom
passwordText.setText(CommonUtils.notEmpty(connectionInfo.getUserPassword()));
}
Object backupHostText = connectionInfo.getProviderProperty(ExasolConstants.DRV_BACKUP_HOST_LIST);
String backupHostText = connectionInfo.getProviderProperty(ExasolConstants.DRV_BACKUP_HOST_LIST);
if (backupHostText != null) {
this.backupHostText.setText(backupHostText.toString());
this.backupHostText.setText(backupHostText);
this.useBackupHostList.setEnabled(true);
this.backupHostText.setEnabled(true);
this.useBackupHostList.setSelection(true);
}
Object encryptComm = connectionInfo.getProviderProperty(ExasolConstants.DRV_ENCRYPT);
String encryptComm = connectionInfo.getProviderProperty(ExasolConstants.DRV_ENCRYPT);
if (encryptComm != null) {
if (encryptComm.toString().equals("1"))
if (encryptComm.equals("1"))
this.encryptCommunication.setEnabled(true);
}
......
plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportConnectionInfo.java
浏览文件 @ 11a72b43
......@@ -39,7 +39,7 @@ public class ImportConnectionInfo {
private String user;
private String password;
private Map<Object, Object> properties = new HashMap<>();
private Map<Object, Object> providerProperties = new HashMap<>();
private Map<String, String> providerProperties = new HashMap<>();
private boolean checked = false;
public ImportConnectionInfo(ImportDriverInfo driverInfo, String id, String alias, String url, String host, String port, String database, String user, String password)
......@@ -138,7 +138,7 @@ public class ImportConnectionInfo {
properties.put(name, value);
}
public Map<Object, Object> getProviderProperties() {
public Map<String, String> getProviderProperties() {
return providerProperties;
}
......
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLWizardPageSettings.java
浏览文件 @ 11a72b43
......@@ -54,9 +54,9 @@ public abstract class MySQLWizardPageSettings<WIZARD extends AbstractToolWizard>
String authUser = null;
String authPassword = null;
{
Object authValue = connectionInfo.getProviderProperty(authProperty);
String authValue = connectionInfo.getProviderProperty(authProperty);
if (authValue != null) {
String authCredentials = encrypter.decrypt(authValue.toString());
String authCredentials = encrypter.decrypt(authValue);
int divPos = authCredentials.indexOf(':');
if (divPos != -1) {
authUser = authCredentials.substring(0, divPos);
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleDataSourceProvider.java
浏览文件 @ 11a72b43
......@@ -74,7 +74,7 @@ public class OracleDataSourceProvider extends JDBCDataSourceProvider implements
{
//boolean isOCI = OCIUtils.isOciDriver(driver);
OracleConstants.ConnectionType connectionType;
Object conTypeProperty = connectionInfo.getProviderProperty(OracleConstants.PROP_CONNECTION_TYPE);
String conTypeProperty = connectionInfo.getProviderProperty(OracleConstants.PROP_CONNECTION_TYPE);
if (conTypeProperty != null) {
connectionType = OracleConstants.ConnectionType.valueOf(CommonUtils.toString(conTypeProperty));
} else {
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @ 11a72b43
......@@ -151,7 +151,7 @@ public class OracleDataSource extends JDBCDataSource
try (JDBCSession session = context.openSession(monitor, DBCExecutionPurpose.META, "Set connection parameters")) {
// Set session settings
Object sessionLanguage = connectionInfo.getProviderProperty(OracleConstants.PROP_SESSION_LANGUAGE);
String sessionLanguage = connectionInfo.getProviderProperty(OracleConstants.PROP_SESSION_LANGUAGE);
if (sessionLanguage != null) {
try {
JDBCUtils.executeSQL(
......@@ -161,7 +161,7 @@ public class OracleDataSource extends JDBCDataSource
log.warn("Can't set session language", e);
}
}
Object sessionTerritory = connectionInfo.getProviderProperty(OracleConstants.PROP_SESSION_TERRITORY);
String sessionTerritory = connectionInfo.getProviderProperty(OracleConstants.PROP_SESSION_TERRITORY);
if (sessionTerritory != null) {
try {
JDBCUtils.executeSQL(
......@@ -171,7 +171,7 @@ public class OracleDataSource extends JDBCDataSource
log.warn("Can't set session territory", e);
}
}
Object nlsDateFormat = connectionInfo.getProviderProperty(OracleConstants.PROP_SESSION_NLS_DATE_FORMAT);
String nlsDateFormat = connectionInfo.getProviderProperty(OracleConstants.PROP_SESSION_NLS_DATE_FORMAT);
if (nlsDateFormat != null) {
try {
JDBCUtils.executeSQL(
......@@ -187,7 +187,7 @@ public class OracleDataSource extends JDBCDataSource
@Override
protected String getConnectionUserName(@NotNull DBPConnectionConfiguration connectionInfo) {
final Object role = connectionInfo.getProviderProperty(OracleConstants.PROP_INTERNAL_LOGON);
final String role = connectionInfo.getProviderProperty(OracleConstants.PROP_INTERNAL_LOGON);
return role == null ? connectionInfo.getUserName() : connectionInfo.getUserName() + " AS " + role;
}
......@@ -285,7 +285,7 @@ public class OracleDataSource extends JDBCDataSource
DBPConnectionConfiguration connectionInfo = getContainer().getConnectionConfiguration();
{
Object useRuleHintProp = connectionInfo.getProviderProperty(OracleConstants.PROP_USE_RULE_HINT);
String useRuleHintProp = connectionInfo.getProviderProperty(OracleConstants.PROP_USE_RULE_HINT);
if (useRuleHintProp != null) {
useRuleHint = CommonUtils.getBoolean(useRuleHintProp, false);
}
......@@ -302,7 +302,7 @@ public class OracleDataSource extends JDBCDataSource
"SELECT 'YES' FROM USER_ROLE_PRIVS WHERE GRANTED_ROLE='DBA'"));
this.isAdminVisible = isAdmin;
if (!isAdminVisible) {
Object showAdmin = connectionInfo.getProviderProperty(OracleConstants.PROP_ALWAYS_SHOW_DBA);
String showAdmin = connectionInfo.getProviderProperty(OracleConstants.PROP_ALWAYS_SHOW_DBA);
if (showAdmin != null) {
isAdminVisible = CommonUtils.getBoolean(showAdmin, false);
}
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleScriptExecuteWizard.java
浏览文件 @ 11a72b43
......@@ -99,7 +99,7 @@ class OracleScriptExecuteWizard extends AbstractScriptExecuteWizard<OracleDataSo
url = "//" + conInfo.getHostName() + (port != null ? ":" + port : "") + "/" + conInfo.getDatabaseName(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
final Object role = conInfo.getProviderProperty(OracleConstants.PROP_INTERNAL_LOGON);
final String role = conInfo.getProviderProperty(OracleConstants.PROP_INTERNAL_LOGON);
if (role != null) {
url += (" AS " + role);
}
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionExtraPage.java
浏览文件 @ 11a72b43
......@@ -130,7 +130,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
// Load values from new connection info
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
Map<Object,Object> providerProperties = connectionInfo.getProviderProperties();
Map<String, String> providerProperties = connectionInfo.getProviderProperties();
// Settings
final Object nlsLanguage = providerProperties.get(OracleConstants.PROP_SESSION_LANGUAGE);
......@@ -160,7 +160,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
@Override
public void saveSettings(DBPDataSourceContainer dataSource)
{
Map<Object, Object> providerProperties = dataSource.getConnectionConfiguration().getProviderProperties();
Map<String, String> providerProperties = dataSource.getConnectionConfiguration().getProviderProperties();
{
// Settings
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionPage.java
浏览文件 @ 11a72b43
......@@ -356,9 +356,9 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
// Load values from new connection info
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
final Object sidService = connectionInfo.getProviderProperty(OracleConstants.PROP_SID_SERVICE);
final String sidService = connectionInfo.getProviderProperty(OracleConstants.PROP_SID_SERVICE);
if (sidService != null) {
sidServiceCombo.setText(OracleConnectionType.valueOf(sidService.toString()).getTitle());
sidServiceCombo.setText(OracleConnectionType.valueOf(sidService).getTitle());
}
//if (isOCI) {
......@@ -375,7 +375,7 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
}
}
Object conTypeProperty = connectionInfo.getProviderProperty(OracleConstants.PROP_CONNECTION_TYPE);
String conTypeProperty = connectionInfo.getProviderProperty(OracleConstants.PROP_CONNECTION_TYPE);
if (conTypeProperty != null) {
connectionType = OracleConstants.ConnectionType.valueOf(CommonUtils.toString(conTypeProperty));
} else {
......@@ -398,12 +398,12 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
break;
case TNS: {
tnsNameCombo.setText(CommonUtils.notEmpty(connectionInfo.getDatabaseName()));
Object tnsPathProperty = connectionInfo.getProviderProperty(OracleConstants.PROP_TNS_PATH);
String tnsPathProperty = connectionInfo.getProviderProperty(OracleConstants.PROP_TNS_PATH);
// if (tnsPathProperty == null) {
// tnsPathProperty = System.getenv(OracleConstants.VAR_TNS_ADMIN);
// }
if (tnsPathProperty != null) {
tnsPathText.setText(tnsPathProperty.toString());
tnsPathText.setText(tnsPathProperty);
}
break;
}
......@@ -422,9 +422,9 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
osAuthCheck.setSelection(false);
}
final Object roleName = connectionInfo.getProviderProperty(OracleConstants.PROP_INTERNAL_LOGON);
final String roleName = connectionInfo.getProviderProperty(OracleConstants.PROP_INTERNAL_LOGON);
if (roleName != null) {
userRoleCombo.setText(roleName.toString().toUpperCase(Locale.ENGLISH));
userRoleCombo.setText(roleName.toUpperCase(Locale.ENGLISH));
}
}
......
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPage.java
浏览文件 @ 11a72b43
......@@ -237,7 +237,7 @@ public class PostgreConnectionPage extends ConnectionPageAbstract implements ICo
connectionInfo.setClientHomeId(homesSelector.getSelectedHome());
}
connectionInfo.setProviderProperty(PostgreConstants.PROP_SHOW_NON_DEFAULT_DB, hideNonDefault.getSelection());
connectionInfo.setProviderProperty(PostgreConstants.PROP_SHOW_NON_DEFAULT_DB, String.valueOf(hideNonDefault.getSelection()));
super.saveSettings(dataSource);
}
......
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
浏览文件 @ 11a72b43
......@@ -42,7 +42,7 @@ public class DBPConnectionConfiguration implements DBPObject
@NotNull
private final Map<Object, Object> properties;
@NotNull
private final Map<Object, Object> providerProperties;
private final Map<String, String> providerProperties;
@NotNull
private final Map<DBPConnectionEventType, DBRShellCommand> events;
@NotNull
......@@ -196,22 +196,22 @@ public class DBPConnectionConfiguration implements DBPObject
////////////////////////////////////////////////////
// Provider properties (extra configuration parameters)
public Object getProviderProperty(Object name)
public String getProviderProperty(String name)
{
return providerProperties.get(name);
}
public void setProviderProperty(Object name, Object value)
public void setProviderProperty(String name, String value)
{
providerProperties.put(name, value);
}
@NotNull
public Map<Object, Object> getProviderProperties() {
public Map<String, String> getProviderProperties() {
return providerProperties;
}
public void setProviderProperties(@NotNull Map<Object, Object> properties)
public void setProviderProperties(@NotNull Map<String, String> properties)
{
this.providerProperties.clear();
this.providerProperties.putAll(properties);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或