Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

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

提交 49d1f794 编写于 作者: J jurgen
浏览文件
操作

Connection configuration refactoring

上级 74812fff
隐藏空白更改
内联 并排
Showing with 258 addition and 176 deletion
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionBootstrap.java 0 → 100644
浏览文件 @ 49d1f794
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License (version 2)
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package org.jkiss.dbeaver.model;
import java.util.*;
/**
* Connection bootstrap info.
* Bootstrap properties are applied to each opened connection after data-source initialization.
*/
public class DBPConnectionBootstrap
{
private String defaultObjectName;
private Boolean defaultAutoCommit;
private Integer defaultTransactionIsolation;
private final List<String> initQueries;
private boolean ignoreErrors;
public DBPConnectionBootstrap()
{
this.initQueries = new ArrayList<String>();
this.ignoreErrors = false;
}
public DBPConnectionBootstrap(DBPConnectionBootstrap info)
{
this.defaultObjectName = info.defaultObjectName;
this.defaultAutoCommit = info.defaultAutoCommit;
this.defaultTransactionIsolation = info.defaultTransactionIsolation;
this.initQueries = new ArrayList<String>(info.initQueries);
this.ignoreErrors = info.ignoreErrors;
}
public List<String> getInitQueries() {
return initQueries;
}
public String getDefaultObjectName() {
return defaultObjectName;
}
public void setDefaultObjectName(String defaultObjectName) {
this.defaultObjectName = defaultObjectName;
}
public Boolean getDefaultAutoCommit() {
return defaultAutoCommit;
}
public void setDefaultAutoCommit(Boolean defaultAutoCommit) {
this.defaultAutoCommit = defaultAutoCommit;
}
public Integer getDefaultTransactionIsolation() {
return defaultTransactionIsolation;
}
public void setDefaultTransactionIsolation(Integer defaultTransactionIsolation) {
this.defaultTransactionIsolation = defaultTransactionIsolation;
}
public boolean isIgnoreErrors() {
return ignoreErrors;
}
public void setIgnoreErrors(boolean ignoreErrors) {
this.ignoreErrors = ignoreErrors;
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionInfo.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionConfiguration.java
浏览文件 @ 49d1f794
......@@ -24,11 +24,10 @@ import org.jkiss.dbeaver.model.runtime.DBRShellCommand;
import java.util.*;
/**
* DBPConnectionInfo
* Connection configuration.
*/
public class DBPConnectionInfo implements DBPObject
public class DBPConnectionConfiguration implements DBPObject
{
private String hostName;
private String hostPort;
private String serverName;
......@@ -40,25 +39,20 @@ public class DBPConnectionInfo implements DBPObject
private final Map<Object, Object> properties;
private final Map<DBPConnectionEventType, DBRShellCommand> events;
private final List<DBWHandlerConfiguration> handlers;
private final List<String> bootstrapQueries;
private final DBPConnectionBootstrap bootstrap;
private DBPConnectionType connectionType;
private String connectionColor;
public static class Bootstrap {
List<String> queries;
boolean ignoreErrors;
}
public DBPConnectionInfo()
public DBPConnectionConfiguration()
{
this.connectionType = DBPConnectionType.DEFAULT_TYPE;
this.properties = new HashMap<Object, Object>();
this.events = new HashMap<DBPConnectionEventType, DBRShellCommand>();
this.handlers = new ArrayList<DBWHandlerConfiguration>();
this.bootstrapQueries = new ArrayList<String>();
this.bootstrap = new DBPConnectionBootstrap();
}
public DBPConnectionInfo(DBPConnectionInfo info)
public DBPConnectionConfiguration(DBPConnectionConfiguration info)
{
this.hostName = info.hostName;
this.hostPort = info.hostPort;
......@@ -78,7 +72,7 @@ public class DBPConnectionInfo implements DBPObject
for (DBWHandlerConfiguration handler : info.handlers) {
this.handlers.add(new DBWHandlerConfiguration(handler));
}
this.bootstrapQueries = new ArrayList<String>(info.bootstrapQueries);
this.bootstrap = new DBPConnectionBootstrap(info.bootstrap);
}
public String getClientHomeId()
......@@ -252,4 +246,8 @@ public class DBPConnectionInfo implements DBPObject
{
this.connectionColor = color;
}
public DBPConnectionBootstrap getBootstrap() {
return bootstrap;
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceProvider.java
浏览文件 @ 49d1f794
......@@ -55,7 +55,7 @@ public interface DBPDataSourceProvider
DBPPropertyDescriptor[] getConnectionProperties(
DBRRunnableContext runnableContext,
DBPDriver driver,
DBPConnectionInfo connectionInfo)
DBPConnectionConfiguration connectionInfo)
throws DBException;
/**
......@@ -64,7 +64,7 @@ public interface DBPDataSourceProvider
* @param connectionInfo connection info
* @return valid connection URL or null (if URLs not supported by driver)
*/
String getConnectionURL(DBPDriver driver, DBPConnectionInfo connectionInfo);
String getConnectionURL(DBPDriver driver, DBPConnectionConfiguration connectionInfo);
/**
* Opens new data source
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceRegistry.java
浏览文件 @ 49d1f794
......@@ -29,6 +29,9 @@ import java.util.List;
*/
public interface DBPDataSourceRegistry {
/**
* Owner project.
*/
IProject getProject();
@Nullable
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
浏览文件 @ 49d1f794
......@@ -108,7 +108,7 @@ public abstract class JDBCDataSource
}
}
DBPConnectionInfo connectionInfo = container.getActualConnectionInfo();
DBPConnectionConfiguration connectionInfo = container.getActualConnectionConfiguration();
if (connectionInfo.getProperties() != null) {
for (Map.Entry<Object,Object> prop : connectionInfo.getProperties().entrySet()) {
connectProps.setProperty(CommonUtils.toString(prop.getKey()), CommonUtils.toString(prop.getValue()));
......@@ -163,12 +163,12 @@ public abstract class JDBCDataSource
}
}
protected String getConnectionUserName(DBPConnectionInfo connectionInfo)
protected String getConnectionUserName(DBPConnectionConfiguration connectionInfo)
{
return connectionInfo.getUserName();
}
protected String getConnectionUserPassword(DBPConnectionInfo connectionInfo)
protected String getConnectionUserPassword(DBPConnectionConfiguration connectionInfo)
{
return connectionInfo.getUserPassword();
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceProvider.java
浏览文件 @ 49d1f794
......@@ -52,7 +52,7 @@ public abstract class JDBCDataSourceProvider implements DBPDataSourceProvider {
public DBPPropertyDescriptor[] getConnectionProperties(
DBRRunnableContext runnableContext,
DBPDriver driver,
DBPConnectionInfo connectionInfo)
DBPConnectionConfiguration connectionInfo)
throws DBException {
Collection<DBPPropertyDescriptor> props = null;
Object driverInstance = driver.getDriverInstance(runnableContext);
......@@ -66,7 +66,7 @@ public abstract class JDBCDataSourceProvider implements DBPDataSourceProvider {
}
private Collection<DBPPropertyDescriptor> readDriverProperties(
DBPConnectionInfo connectionInfo,
DBPConnectionConfiguration connectionInfo,
Driver driver)
throws DBException {
Properties driverProps = new Properties();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/HTTPTunnelImpl.java
浏览文件 @ 49d1f794
......@@ -18,7 +18,7 @@
package org.jkiss.dbeaver.model.impl.net;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
import org.jkiss.dbeaver.model.net.DBWTunnel;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
......@@ -31,14 +31,14 @@ import java.io.IOException;
public class HTTPTunnelImpl implements DBWTunnel {
@Override
public DBPConnectionInfo initializeTunnel(DBRProgressMonitor monitor, DBWHandlerConfiguration configuration, DBPConnectionInfo connectionInfo)
public DBPConnectionConfiguration initializeTunnel(DBRProgressMonitor monitor, DBWHandlerConfiguration configuration, DBPConnectionConfiguration connectionInfo)
throws DBException, IOException
{
return connectionInfo;
}
@Override
public void closeTunnel(DBRProgressMonitor monitor, DBPConnectionInfo connectionInfo) throws DBException, IOException
public void closeTunnel(DBRProgressMonitor monitor, DBPConnectionConfiguration connectionInfo) throws DBException, IOException
{
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
浏览文件 @ 49d1f794
......@@ -22,7 +22,7 @@ import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.Log;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPPreferenceStore;
import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
import org.jkiss.dbeaver.model.net.DBWTunnel;
......@@ -48,7 +48,7 @@ public class SSHTunnelImpl implements DBWTunnel {
private transient Session session;
@Override
public DBPConnectionInfo initializeTunnel(DBRProgressMonitor monitor, DBWHandlerConfiguration configuration, DBPConnectionInfo connectionInfo)
public DBPConnectionConfiguration initializeTunnel(DBRProgressMonitor monitor, DBWHandlerConfiguration configuration, DBPConnectionConfiguration connectionInfo)
throws DBException, IOException
{
String dbPortString = connectionInfo.getHostPort();
......@@ -143,7 +143,7 @@ public class SSHTunnelImpl implements DBWTunnel {
} catch (JSchException e) {
throw new DBException("Cannot establish tunnel", e);
}
connectionInfo = new DBPConnectionInfo(connectionInfo);
connectionInfo = new DBPConnectionConfiguration(connectionInfo);
String newPortValue = String.valueOf(localPort);
// Replace database host/port and URL - let's use localhost
connectionInfo.setHostName(LOCALHOST_NAME);
......@@ -178,7 +178,7 @@ public class SSHTunnelImpl implements DBWTunnel {
}
@Override
public void closeTunnel(DBRProgressMonitor monitor, DBPConnectionInfo connectionInfo) throws DBException, IOException
public void closeTunnel(DBRProgressMonitor monitor, DBPConnectionConfiguration connectionInfo) throws DBException, IOException
{
if (session != null) {
session.disconnect();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/DBWTunnel.java
浏览文件 @ 49d1f794
......@@ -18,7 +18,7 @@
package org.jkiss.dbeaver.model.net;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import java.io.IOException;
......@@ -28,10 +28,10 @@ import java.io.IOException;
*/
public interface DBWTunnel extends DBWNetworkHandler {
DBPConnectionInfo initializeTunnel(DBRProgressMonitor monitor, DBWHandlerConfiguration configuration, DBPConnectionInfo connectionInfo)
DBPConnectionConfiguration initializeTunnel(DBRProgressMonitor monitor, DBWHandlerConfiguration configuration, DBPConnectionConfiguration connectionInfo)
throws DBException, IOException;
void closeTunnel(DBRProgressMonitor monitor, DBPConnectionInfo connectionInfo)
void closeTunnel(DBRProgressMonitor monitor, DBPConnectionConfiguration connectionInfo)
throws DBException, IOException;
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/struct/DBSDataSourceContainer.java
浏览文件 @ 49d1f794
......@@ -48,18 +48,18 @@ public interface DBSDataSourceContainer extends DBSObject, DBDPreferences
DBPDriver getDriver();
/**
* Connection info
* Connection configuration.
* @return connection details
*/
@NotNull
DBPConnectionInfo getConnectionInfo();
DBPConnectionConfiguration getConnectionConfiguration();
/**
* Actual connection info. Contains actual parameters used to connect to this datasource.
* Differs from getConnectionInfo() in case if tunnel or proxy was used.
* @return actual connection info.
* Actual connection configuration. Contains actual parameters used to connect to this datasource.
* Differs from getConnectionConfiguration() in case if tunnel or proxy was used.
* @return actual connection configuration.
*/
DBPConnectionInfo getActualConnectionInfo();
DBPConnectionConfiguration getActualConnectionConfiguration();
boolean isShowSystemObjects();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @ 49d1f794
......@@ -119,8 +119,8 @@ public class DataSourceDescriptor
@NotNull
private DriverDescriptor driver;
@NotNull
private DBPConnectionInfo connectionInfo;
private DBPConnectionInfo tunnelConnectionInfo;
private DBPConnectionConfiguration connectionInfo;
private DBPConnectionConfiguration tunnelConnectionInfo;
@NotNull
private String id;
private String name;
......@@ -154,7 +154,7 @@ public class DataSourceDescriptor
@NotNull DataSourceRegistry registry,
@NotNull String id,
@NotNull DriverDescriptor driver,
@NotNull DBPConnectionInfo connectionInfo)
@NotNull DBPConnectionConfiguration connectionInfo)
{
this.registry = registry;
this.id = id;
......@@ -218,18 +218,18 @@ public class DataSourceDescriptor
@NotNull
@Override
public DBPConnectionInfo getConnectionInfo()
public DBPConnectionConfiguration getConnectionConfiguration()
{
return connectionInfo;
}
public void setConnectionInfo(@NotNull DBPConnectionInfo connectionInfo)
public void setConnectionInfo(@NotNull DBPConnectionConfiguration connectionInfo)
{
this.connectionInfo = connectionInfo;
}
@Override
public DBPConnectionInfo getActualConnectionInfo()
public DBPConnectionConfiguration getActualConnectionConfiguration()
{
return tunnelConnectionInfo != null ? tunnelConnectionInfo : connectionInfo;
}
......@@ -291,7 +291,7 @@ public class DataSourceDescriptor
if (preferenceStore.contains(DBeaverPreferences.DEFAULT_AUTO_COMMIT)) {
return preferenceStore.getBoolean(DBeaverPreferences.DEFAULT_AUTO_COMMIT);
} else {
return getConnectionInfo().getConnectionType().isAutocommit();
return getConnectionConfiguration().getConnectionType().isAutocommit();
}
}
......@@ -324,7 +324,7 @@ public class DataSourceDescriptor
}
}
// Save in preferences
if (autoCommit == getConnectionInfo().getConnectionType().isAutocommit()) {
if (autoCommit == getConnectionConfiguration().getConnectionType().isAutocommit()) {
preferenceStore.setToDefault(DBeaverPreferences.DEFAULT_AUTO_COMMIT);
} else {
preferenceStore.setValue(DBeaverPreferences.DEFAULT_AUTO_COMMIT, autoCommit);
......@@ -600,7 +600,7 @@ public class DataSourceDescriptor
}
connecting = true;
DBPConnectionInfo savedConnectionInfo = null;
DBPConnectionConfiguration savedConnectionInfo = null;
tunnelConnectionInfo = null;
try {
// Handle tunnel
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
浏览文件 @ 49d1f794
......@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.registry;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.edit.DBECommandContext;
import org.jkiss.dbeaver.model.edit.DBEObjectMaker;
import org.jkiss.dbeaver.model.impl.DBSObjectCache;
......@@ -72,7 +72,7 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
registry,
DataSourceDescriptor.generateNewId(dsTpl.getDriver()),
dsTpl.getDriver(),
new DBPConnectionInfo(dsTpl.getConnectionInfo()));
new DBPConnectionConfiguration(dsTpl.getConnectionConfiguration()));
dataSource.copyFrom(dsTpl);
// Generate new name
String origName = dsTpl.getName();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java
浏览文件 @ 49d1f794
......@@ -386,7 +386,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
{
// Connection info
DBPConnectionInfo connectionInfo = dataSource.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = dataSource.getConnectionConfiguration();
xml.startElement(RegistryConstants.TAG_CONNECTION);
if (!CommonUtils.isEmpty(connectionInfo.getHostName())) {
xml.addAttribute(RegistryConstants.ATTR_HOST, connectionInfo.getHostName());
......@@ -598,7 +598,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
DataSourceRegistry.this,
id,
driver,
new DBPConnectionInfo());
new DBPConnectionConfiguration());
curDataSource.setName(name);
String createDate = atts.getValue(RegistryConstants.ATTR_CREATE_DATE);
if (!CommonUtils.isEmpty(createDate)) {
......@@ -637,22 +637,22 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
driver.setName(atts.getValue(RegistryConstants.ATTR_URL));
driver.setDriverClassName("java.sql.Driver");
}
curDataSource.getConnectionInfo().setHostName(atts.getValue(RegistryConstants.ATTR_HOST));
curDataSource.getConnectionInfo().setHostPort(atts.getValue(RegistryConstants.ATTR_PORT));
curDataSource.getConnectionInfo().setServerName(atts.getValue(RegistryConstants.ATTR_SERVER));
curDataSource.getConnectionInfo().setDatabaseName(atts.getValue(RegistryConstants.ATTR_DATABASE));
curDataSource.getConnectionInfo().setUrl(atts.getValue(RegistryConstants.ATTR_URL));
curDataSource.getConnectionInfo().setUserName(atts.getValue(RegistryConstants.ATTR_USER));
curDataSource.getConnectionInfo().setUserPassword(decryptPassword(atts.getValue(RegistryConstants.ATTR_PASSWORD)));
curDataSource.getConnectionInfo().setClientHomeId(atts.getValue(RegistryConstants.ATTR_HOME));
curDataSource.getConnectionInfo().setConnectionType(
curDataSource.getConnectionConfiguration().setHostName(atts.getValue(RegistryConstants.ATTR_HOST));
curDataSource.getConnectionConfiguration().setHostPort(atts.getValue(RegistryConstants.ATTR_PORT));
curDataSource.getConnectionConfiguration().setServerName(atts.getValue(RegistryConstants.ATTR_SERVER));
curDataSource.getConnectionConfiguration().setDatabaseName(atts.getValue(RegistryConstants.ATTR_DATABASE));
curDataSource.getConnectionConfiguration().setUrl(atts.getValue(RegistryConstants.ATTR_URL));
curDataSource.getConnectionConfiguration().setUserName(atts.getValue(RegistryConstants.ATTR_USER));
curDataSource.getConnectionConfiguration().setUserPassword(decryptPassword(atts.getValue(RegistryConstants.ATTR_PASSWORD)));
curDataSource.getConnectionConfiguration().setClientHomeId(atts.getValue(RegistryConstants.ATTR_HOME));
curDataSource.getConnectionConfiguration().setConnectionType(
DataSourceProviderRegistry.getInstance().getConnectionType(
CommonUtils.toString(atts.getValue(RegistryConstants.ATTR_TYPE)),
DBPConnectionType.DEFAULT_TYPE)
);
String colorValue = atts.getValue(RegistryConstants.ATTR_COLOR);
if (!CommonUtils.isEmpty(colorValue)) {
curDataSource.getConnectionInfo().setConnectionColor(colorValue);
curDataSource.getConnectionConfiguration().setConnectionColor(colorValue);
}
curDataSource.refreshConnectionInfo();
}
......@@ -662,7 +662,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
atts.getValue(RegistryConstants.ATTR_NAME),
atts.getValue(RegistryConstants.ATTR_VALUE));
} else if (curDataSource != null) {
curDataSource.getConnectionInfo().setProperty(
curDataSource.getConnectionConfiguration().setProperty(
atts.getValue(RegistryConstants.ATTR_NAME),
atts.getValue(RegistryConstants.ATTR_VALUE));
}
......@@ -674,7 +674,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
curCommand.setShowProcessPanel(CommonUtils.getBoolean(atts.getValue(RegistryConstants.ATTR_SHOW_PANEL)));
curCommand.setWaitProcessFinish(CommonUtils.getBoolean(atts.getValue(RegistryConstants.ATTR_WAIT_PROCESS)));
curCommand.setTerminateAtDisconnect(CommonUtils.getBoolean(atts.getValue(RegistryConstants.ATTR_TERMINATE_AT_DISCONNECT)));
curDataSource.getConnectionInfo().setEvent(eventType, curCommand);
curDataSource.getConnectionConfiguration().setEvent(eventType, curCommand);
}
} else if (localName.equals(RegistryConstants.TAG_CUSTOM_PROPERTY)) {
if (curDataSource != null) {
......@@ -696,7 +696,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
curNetworkHandler.setUserName(CommonUtils.notEmpty(atts.getValue(RegistryConstants.ATTR_USER)));
curNetworkHandler.setSavePassword(CommonUtils.getBoolean(atts.getValue(RegistryConstants.ATTR_SAVE_PASSWORD)));
curNetworkHandler.setPassword(decryptPassword(atts.getValue(RegistryConstants.ATTR_PASSWORD)));
curDataSource.getConnectionInfo().addHandler(curNetworkHandler);
curDataSource.getConnectionConfiguration().addHandler(curNetworkHandler);
}
} else if (localName.equals(RegistryConstants.TAG_FILTER)) {
if (curDataSource != null) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/EventProcessorJob.java
浏览文件 @ 49d1f794
......@@ -25,7 +25,7 @@ import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.core.Log;
import org.jkiss.dbeaver.model.DBPConnectionEventType;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.runtime.DBRProcessDescriptor;
import org.jkiss.dbeaver.model.runtime.DBRShellCommand;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
......@@ -62,7 +62,7 @@ public abstract class EventProcessorJob extends AbstractJob {
protected void processEvents(DBPConnectionEventType eventType)
{
DBPConnectionInfo info = container.getActualConnectionInfo();
DBPConnectionConfiguration info = container.getActualConnectionConfiguration();
DBRShellCommand command = info.getEvent(eventType);
if (command != null && command.isEnabled()) {
Map<String, Object> variables = new HashMap<String, Object>();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/net/GlobalProxyAuthenticator.java
浏览文件 @ 49d1f794
......@@ -80,7 +80,7 @@ public class GlobalProxyAuthenticator extends Authenticator {
DBCExecutionContext activeContext = DBCExecutionContext.ACTIVE_CONTEXT.get();
if (activeContext != null) {
DBSDataSourceContainer container = activeContext.getDataSource().getContainer();
for (DBWHandlerConfiguration networkHandler : container.getConnectionInfo().getDeclaredHandlers()) {
for (DBWHandlerConfiguration networkHandler : container.getConnectionConfiguration().getDeclaredHandlers()) {
if (networkHandler.isEnabled() && networkHandler.getType() == DBWHandlerType.PROXY) {
String userName = networkHandler.getUserName();
String userPassword = networkHandler.getPassword();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/net/GlobalProxySelector.java
浏览文件 @ 49d1f794
......@@ -61,7 +61,7 @@ public class GlobalProxySelector extends ProxySelector {
if (activeContext != null) {
List<Proxy> proxies = null;
DBSDataSourceContainer container = activeContext.getDataSource().getContainer();
for (DBWHandlerConfiguration networkHandler : container.getConnectionInfo().getDeclaredHandlers()) {
for (DBWHandlerConfiguration networkHandler : container.getConnectionConfiguration().getDeclaredHandlers()) {
if (networkHandler.isEnabled() && networkHandler.getType() == DBWHandlerType.PROXY) {
Map<String,String> proxyProps = networkHandler.getProperties();
String proxyHost = proxyProps.get(SocksConstants.PROP_HOST);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/IDataSourceConnectionEditorSite.java
浏览文件 @ 49d1f794
......@@ -18,13 +18,9 @@
package org.jkiss.dbeaver.ui;
import org.eclipse.jface.operation.IRunnableContext;
import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPDriver;
import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
浏览文件 @ 49d1f794
......@@ -1355,7 +1355,7 @@ public class UIUtils {
}
}
public static Color getConnectionColor(DBPConnectionInfo connectionInfo) {
public static Color getConnectionColor(DBPConnectionConfiguration connectionInfo) {
String rgbString = connectionInfo.getConnectionColor();
if (CommonUtils.isEmpty(rgbString)) {
rgbString = connectionInfo.getConnectionType().getColor();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java
浏览文件 @ 49d1f794
......@@ -59,8 +59,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
// Already connecting/disconnecting - just return
return;
}
final String oldName = dataSourceDescriptor.getConnectionInfo().getUserName();
final String oldPassword = dataSourceDescriptor.getConnectionInfo().getUserPassword();
final String oldName = dataSourceDescriptor.getConnectionConfiguration().getUserName();
final String oldPassword = dataSourceDescriptor.getConnectionConfiguration().getUserPassword();
if (!dataSourceDescriptor.isSavePassword()) {
// Ask for password
if (!askForPassword(dataSourceDescriptor, null)) {
......@@ -68,7 +68,7 @@ public class DataSourceConnectHandler extends DataSourceHandler
return;
}
}
for (DBWHandlerConfiguration handler : dataSourceDescriptor.getConnectionInfo().getDeclaredHandlers()) {
for (DBWHandlerConfiguration handler : dataSourceDescriptor.getConnectionConfiguration().getDeclaredHandlers()) {
if (handler.isEnabled() && handler.isSecured() && !handler.isSavePassword()) {
if (!askForPassword(dataSourceDescriptor, handler)) {
updateDataSourceObject(dataSourceDescriptor);
......@@ -90,8 +90,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
// but we need a password to open isolated contexts (e.g. for data export)
// Currently it is not possible to ask for password from isolation context opening
// procedure. We need to do something here...
//dataSourceDescriptor.getConnectionInfo().setUserName(oldName);
//dataSourceDescriptor.getConnectionInfo().setUserPassword(oldPassword);
//dataSourceDescriptor.getConnectionConfiguration().setUserName(oldName);
//dataSourceDescriptor.getConnectionConfiguration().setUserPassword(oldPassword);
}
}
if (onFinish != null) {
......@@ -161,8 +161,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
String prompt = networkHandler != null ?
NLS.bind(CoreMessages.dialog_connection_auth_title_for_handler, networkHandler.getTitle()) :
"'" + dataSourceContainer.getName() + CoreMessages.dialog_connection_auth_title; //$NON-NLS-1$
String user = networkHandler != null ? networkHandler.getUserName() : dataSourceContainer.getConnectionInfo().getUserName();
String password = networkHandler != null ? networkHandler.getPassword() : dataSourceContainer.getConnectionInfo().getUserPassword();
String user = networkHandler != null ? networkHandler.getUserName() : dataSourceContainer.getConnectionConfiguration().getUserName();
String password = networkHandler != null ? networkHandler.getPassword() : dataSourceContainer.getConnectionConfiguration().getUserPassword();
DBAAuthInfo authInfo = DBUserInterface.getInstance().promptUserCredentials(prompt, user, password);
if (authInfo == null) {
......@@ -174,8 +174,8 @@ public class DataSourceConnectHandler extends DataSourceHandler
networkHandler.setPassword(authInfo.getUserPassword());
networkHandler.setSavePassword(authInfo.isSavePassword());
} else {
dataSourceContainer.getConnectionInfo().setUserName(authInfo.getUserName());
dataSourceContainer.getConnectionInfo().setUserPassword(authInfo.getUserPassword());
dataSourceContainer.getConnectionConfiguration().setUserName(authInfo.getUserName());
dataSourceContainer.getConnectionConfiguration().setUserPassword(authInfo.getUserPassword());
dataSourceContainer.setSavePassword(authInfo.isSavePassword());
}
if (dataSourceContainer.isSavePassword()) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ConnectionPropertiesControl.java
浏览文件 @ 49d1f794
......@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBConstants;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPDriver;
import org.jkiss.dbeaver.model.DBPPropertyDescriptor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
......@@ -55,7 +55,7 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
setExpandSingleRoot(false);
}
public PropertySourceCustom makeProperties(DBRRunnableContext runnableContext, DBPDriver driver, DBPConnectionInfo connectionInfo)
public PropertySourceCustom makeProperties(DBRRunnableContext runnableContext, DBPDriver driver, DBPConnectionConfiguration connectionInfo)
{
Map<Object, Object> connectionProps = new HashMap<Object, Object>();
connectionProps.putAll(driver.getConnectionProperties());
......@@ -132,7 +132,7 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
return propertyDescriptors;
}
private void loadDriverProperties(DBRRunnableContext runnableContext, DBPDriver driver, DBPConnectionInfo connectionInfo)
private void loadDriverProperties(DBRRunnableContext runnableContext, DBPDriver driver, DBPConnectionConfiguration connectionInfo)
{
try {
final DBPPropertyDescriptor[] connectionsProps =
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java
浏览文件 @ 49d1f794
......@@ -21,7 +21,7 @@ import org.eclipse.jface.dialogs.DialogPage;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ui.IDataSourceConnectionEditor;
import org.jkiss.dbeaver.ui.IDataSourceConnectionEditorSite;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
/**
......@@ -54,10 +54,10 @@ public abstract class ConnectionPageAbstract extends DialogPage implements IData
@Override
public void saveSettings(DataSourceDescriptor dataSource)
{
saveConnectionURL(dataSource.getConnectionInfo());
saveConnectionURL(dataSource.getConnectionConfiguration());
}
protected void saveConnectionURL(DBPConnectionInfo connectionInfo)
protected void saveConnectionURL(DBPConnectionConfiguration connectionInfo)
{
if (!isCustomURL()) {
try {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
浏览文件 @ 49d1f794
......@@ -128,7 +128,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
if (connectionNameText != null) {
ConnectionPageSettings settings = wizard.getPageSettings();
if (settings != null && connectionNameText != null && (CommonUtils.isEmpty(connectionNameText.getText()) || !connectionNameChanged)) {
DBPConnectionInfo connectionInfo = settings.getActiveDataSource().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = settings.getActiveDataSource().getConnectionConfiguration();
String newName = dataSourceDescriptor == null ? "" : dataSourceDescriptor.getName(); //$NON-NLS-1$
if (CommonUtils.isEmpty(newName)) {
newName = connectionInfo.getDatabaseName();
......@@ -159,7 +159,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
if (dataSourceDescriptor != null) {
if (!activated) {
// Get settings from data source descriptor
connectionTypeCombo.select(dataSourceDescriptor.getConnectionInfo().getConnectionType());
connectionTypeCombo.select(dataSourceDescriptor.getConnectionConfiguration().getConnectionType());
savePasswordCheck.setSelection(dataSourceDescriptor.isSavePassword());
autocommit.setSelection(dataSourceDescriptor.isDefaultAutoCommit());
showSystemObjects.setSelection(dataSourceDescriptor.isShowSystemObjects());
......@@ -191,8 +191,8 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
if (eventsButton != null) {
eventsButton.setFont(getFont());
DataSourceDescriptor dataSource = getWizard().getPageSettings().getActiveDataSource();
for (DBPConnectionEventType eventType : dataSource.getConnectionInfo().getDeclaredEvents()) {
if (dataSource.getConnectionInfo().getEvent(eventType).isEnabled()) {
for (DBPConnectionEventType eventType : dataSource.getConnectionConfiguration().getDeclaredEvents()) {
if (dataSource.getConnectionConfiguration().getEvent(eventType).isEnabled()) {
eventsButton.setFont(boldFont);
break;
}
......@@ -295,10 +295,10 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
DataSourceDescriptor dataSource = wizard.getPageSettings().getActiveDataSource();
UIUtils.showPreferencesFor(
getControl().getShell(),
dataSource.getConnectionInfo().getConnectionType(),
dataSource.getConnectionConfiguration().getConnectionType(),
PrefPageConnectionTypes.PAGE_ID);
loadConnectionTypes();
DBPConnectionType connectionType = dataSource.getConnectionInfo().getConnectionType();
DBPConnectionType connectionType = dataSource.getConnectionConfiguration().getConnectionType();
connectionTypeCombo.select(connectionType);
autocommit.setSelection(connectionType.isAutocommit());
}
......@@ -487,7 +487,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
dataSource.resetPassword();
}
if (connectionTypeCombo.getSelectionIndex() >= 0) {
dataSource.getConnectionInfo().setConnectionType(
dataSource.getConnectionConfiguration().setConnectionType(
(DBPConnectionType) connectionTypeCombo.getData(connectionTypeCombo.getSelectionIndex()));
}
for (FilterInfo filterInfo : filters) {
......@@ -505,8 +505,8 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
dataSource);
if (dialog.open() == IDialogConstants.OK_ID) {
eventsButton.setFont(getFont());
for (DBPConnectionEventType eventType : dataSource.getConnectionInfo().getDeclaredEvents()) {
if (dataSource.getConnectionInfo().getEvent(eventType).isEnabled()) {
for (DBPConnectionEventType eventType : dataSource.getConnectionConfiguration().getDeclaredEvents()) {
if (dataSource.getConnectionConfiguration().getEvent(eventType).isEnabled()) {
eventsButton.setFont(boldFont);
break;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java
浏览文件 @ 49d1f794
......@@ -136,7 +136,7 @@ public class ConnectionPageNetwork extends ActiveWizardPage<ConnectionWizard> {
NetworkHandlerRegistry registry = NetworkHandlerRegistry.getInstance();
TabItem selectItem = null;
for (NetworkHandlerDescriptor descriptor : registry.getDescriptors()) {
DBWHandlerConfiguration configuration = dataSource.getConnectionInfo().getHandler(descriptor.getId());
DBWHandlerConfiguration configuration = dataSource.getConnectionConfiguration().getHandler(descriptor.getId());
if (configuration == null) {
configuration = new DBWHandlerConfiguration(descriptor, driver);
}
......@@ -185,7 +185,7 @@ public class ConnectionPageNetwork extends ActiveWizardPage<ConnectionWizard> {
}
}
if (foundHandlers) {
dataSource.getConnectionInfo().setHandlers(handlers);
dataSource.getConnectionConfiguration().setHandlers(handlers);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageSettings.java
浏览文件 @ 49d1f794
......@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.runtime.RunnableContextDelegate;
import org.jkiss.dbeaver.ui.ICompositeDialogPage;
import org.jkiss.dbeaver.ui.IDataSourceConnectionEditor;
import org.jkiss.dbeaver.ui.IDataSourceConnectionEditorSite;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.registry.DataSourceViewDescriptor;
......@@ -130,7 +130,7 @@ class ConnectionPageSettings extends ActiveWizardPage<ConnectionWizard> implemen
void saveSettings(DataSourceDescriptor dataSource)
{
getActiveDataSource().getConnectionInfo().getProperties().clear();
getActiveDataSource().getConnectionConfiguration().getProperties().clear();
if (connectionEditor != null) {
connectionEditor.saveSettings(dataSource);
}
......@@ -231,13 +231,13 @@ class ConnectionPageSettings extends ActiveWizardPage<ConnectionWizard> implemen
DriverDescriptor driver = getDriver();
DataSourceDescriptor info = infoMap.get(driver);
if (info == null) {
DBPConnectionInfo connectionInfo = new DBPConnectionInfo();
DBPConnectionConfiguration connectionInfo = new DBPConnectionConfiguration();
info = new DataSourceDescriptor(
wizard.getDataSourceRegistry(),
DataSourceDescriptor.generateNewId(wizard.getSelectedDriver()),
wizard.getSelectedDriver(),
connectionInfo);
info.getConnectionInfo().setClientHomeId(driver.getDefaultClientHomeId());
info.getConnectionConfiguration().setClientHomeId(driver.getDefaultClientHomeId());
infoMap.put(driver, info);
}
return info;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
浏览文件 @ 49d1f794
......@@ -75,7 +75,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
dataSourceRegistry,
dataSource.getId(),
getSelectedDriver(),
dataSource.getConnectionInfo());
dataSource.getConnectionConfiguration());
try {
saveSettings(testDataSource);
......@@ -142,7 +142,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
Thread.currentThread().setName(CoreMessages.dialog_connection_wizard_start_connection_monitor_thread);
try {
testDataSource.setName(testDataSource.getConnectionInfo().getUrl());
testDataSource.setName(testDataSource.getConnectionConfiguration().getUrl());
monitor.worked(1);
testDataSource.connect(monitor, initOnTest, false);
monitor.worked(1);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/DriverPropertiesDialogPage.java
浏览文件 @ 49d1f794
......@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.ui.dialogs.connection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
......@@ -39,7 +39,7 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
private ConnectionPropertiesControl propsControl;
private PropertySourceCustom propertySource;
private DBPConnectionInfo prevConnectionInfo = null;
private DBPConnectionConfiguration prevConnectionInfo = null;
public DriverPropertiesDialogPage(ConnectionPageAbstract hostPage)
{
......@@ -73,10 +73,10 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
protected void refreshDriverProperties()
{
DataSourceDescriptor activeDataSource = site.getActiveDataSource();
if (prevConnectionInfo == activeDataSource.getConnectionInfo()) {
if (prevConnectionInfo == activeDataSource.getConnectionConfiguration()) {
return;
}
DBPConnectionInfo tmpConnectionInfo = new DBPConnectionInfo();
DBPConnectionConfiguration tmpConnectionInfo = new DBPConnectionConfiguration();
DataSourceDescriptor tempDataSource = new DataSourceDescriptor(
site.getDataSourceRegistry(),
activeDataSource.getId(),
......@@ -84,13 +84,13 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
tmpConnectionInfo);
try {
hostPage.saveSettings(tempDataSource);
tmpConnectionInfo.getProperties().putAll(activeDataSource.getConnectionInfo().getProperties());
tmpConnectionInfo.getProperties().putAll(activeDataSource.getConnectionConfiguration().getProperties());
propertySource = propsControl.makeProperties(
site.getRunnableContext(),
site.getDriver(),
tmpConnectionInfo);
propsControl.loadProperties(propertySource);
prevConnectionInfo = activeDataSource.getConnectionInfo();
prevConnectionInfo = activeDataSource.getConnectionConfiguration();
} finally {
tempDataSource.dispose();
}
......@@ -100,7 +100,7 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
public void saveSettings(DataSourceDescriptor dataSource)
{
if (propertySource != null) {
dataSource.getConnectionInfo().getProperties().putAll(propertySource.getProperties());
dataSource.getConnectionConfiguration().getProperties().putAll(propertySource.getProperties());
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
浏览文件 @ 49d1f794
......@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPropertyPage;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceViewDescriptor;
import org.jkiss.dbeaver.registry.DriverDescriptor;
......@@ -40,7 +40,7 @@ import java.util.List;
public class EditConnectionWizard extends ConnectionWizard
{
private DataSourceDescriptor dataSource;
private DBPConnectionInfo oldData;
private DBPConnectionConfiguration oldData;
private ConnectionPageSettings pageSettings;
private ConnectionPageGeneral pageGeneral;
private ConnectionPageNetwork pageNetwork;
......@@ -54,7 +54,7 @@ public class EditConnectionWizard extends ConnectionWizard
{
super(dataSource.getRegistry());
this.dataSource = dataSource;
this.oldData = new DBPConnectionInfo(this.dataSource.getConnectionInfo());
this.oldData = new DBPConnectionConfiguration(this.dataSource.getConnectionConfiguration());
setWindowTitle(CoreMessages.dialog_connection_wizard_title);
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditShellCommandsDialogPage.java
浏览文件 @ 49d1f794
......@@ -60,7 +60,7 @@ public class EditShellCommandsDialogPage extends ActiveWizardPage<ConnectionWiza
setDescription(CoreMessages.dialog_connection_events_title);
setImageDescriptor(DBeaverIcons.getImageDescriptor(DBIcon.EVENT));
for (DBPConnectionEventType eventType : DBPConnectionEventType.values()) {
DBRShellCommand command = dataSource.getConnectionInfo().getEvent(eventType);
DBRShellCommand command = dataSource.getConnectionConfiguration().getEvent(eventType);
eventsCache.put(eventType, command == null ? null : new DBRShellCommand(command));
}
}
......@@ -238,7 +238,7 @@ public class EditShellCommandsDialogPage extends ActiveWizardPage<ConnectionWiza
void saveConfigurations(DataSourceDescriptor dataSource)
{
for (Map.Entry<DBPConnectionEventType, DBRShellCommand> entry : eventsCache.entrySet()) {
dataSource.getConnectionInfo().setEvent(entry.getKey(), entry.getValue());
dataSource.getConnectionConfiguration().setEvent(entry.getKey(), entry.getValue());
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
浏览文件 @ 49d1f794
......@@ -164,7 +164,7 @@ public class NewConnectionWizard extends ConnectionWizard
DriverDescriptor driver = getSelectedDriver();
DataSourceDescriptor dataSourceTpl = getPageSettings().getActiveDataSource();
DataSourceDescriptor dataSourceNew = new DataSourceDescriptor(
dataSourceRegistry, dataSourceTpl.getId(), driver, dataSourceTpl.getConnectionInfo());
dataSourceRegistry, dataSourceTpl.getId(), driver, dataSourceTpl.getConnectionConfiguration());
dataSourceNew.copyFrom(dataSourceTpl);
saveSettings(dataSourceNew);
dataSourceRegistry.addDataSource(dataSourceNew);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizard.java
浏览文件 @ 49d1f794
......@@ -27,7 +27,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBPClientHome;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
......@@ -50,7 +50,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject>
private final BASE_OBJECT databaseObject;
private DBPClientHome clientHome;
private DBPConnectionInfo connectionInfo;
private DBPConnectionConfiguration connectionInfo;
private String toolUserName;
private String toolUserPassword;
......@@ -76,7 +76,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject>
return databaseObject;
}
public DBPConnectionInfo getConnectionInfo()
public DBPConnectionConfiguration getConnectionInfo()
{
return connectionInfo;
}
......@@ -112,7 +112,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject>
public void createPageControls(Composite pageContainer)
{
DBSDataSourceContainer container = getDatabaseObject().getDataSource().getContainer();
connectionInfo = container.getActualConnectionInfo();
connectionInfo = container.getActualConnectionConfiguration();
super.createPageControls(pageContainer);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java
浏览文件 @ 49d1f794
......@@ -50,12 +50,12 @@ public class DatabaseEditorUtils {
if (editor instanceof IDataSourceContainerProvider) {
DBSDataSourceContainer container = ((IDataSourceContainerProvider) editor).getDataSourceContainer();
if (container != null) {
bgColor = UIUtils.getConnectionColor(container.getConnectionInfo());
bgColor = UIUtils.getConnectionColor(container.getConnectionConfiguration());
}
} else if (editor instanceof DBPContextProvider) {
DBCExecutionContext context = ((DBPContextProvider) editor).getExecutionContext();
if (context != null) {
bgColor = UIUtils.getConnectionColor(context.getDataSource().getContainer().getConnectionInfo());
bgColor = UIUtils.getConnectionColor(context.getDataSource().getContainer().getConnectionConfiguration());
}
}
if (bgColor == null) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java
浏览文件 @ 49d1f794
......@@ -102,7 +102,7 @@ public class SQLEditorInput extends ProjectFileEditorInput implements IPersistab
"Script: " + getFile().getName() + " \n" +
"Connection: " + dataSourceContainer.getName() + " \n" +
"Type: " + (dataSourceContainer.getDriver() == null ? "Unknown" : dataSourceContainer.getDriver().getFullName()) + " \n" +
"URL: " + dataSourceContainer.getConnectionInfo().getUrl();
"URL: " + dataSourceContainer.getConnectionConfiguration().getUrl();
}
@Override
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DataSourceManagementToolbar.java
浏览文件 @ 49d1f794
......@@ -351,12 +351,12 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
connectionCombo.add(
DBeaverIcons.getImage(dsNode == null ? DBIcon.TREE_DATABASE : dsNode.getNodeIconDefault()),
ds.getName(),
UIUtils.getConnectionColor(ds.getConnectionInfo()),
UIUtils.getConnectionColor(ds.getConnectionConfiguration()),
ds);
} else {
TableItem item = connectionCombo.getItem(i + 1);
item.setText(ds.getName());
item.setBackground(UIUtils.getConnectionColor(ds.getConnectionInfo()));
item.setBackground(UIUtils.getConnectionColor(ds.getConnectionConfiguration()));
}
if (dataSourceContainer == ds) {
selectionIndex = i + 1;
......@@ -521,7 +521,7 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
databaseCombo.add(
DBeaverIcons.getImage(dbNode.getNodeIconDefault()),
database.getName(),
UIUtils.getConnectionColor(dataSource.getContainer().getConnectionInfo()),
UIUtils.getConnectionColor(dataSource.getContainer().getConnectionConfiguration()),
database);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorLabelProvider.java
浏览文件 @ 49d1f794
......@@ -135,7 +135,7 @@ class DatabaseNavigatorLabelProvider extends LabelProvider implements IFontProvi
if (element instanceof DBNDataSource) {
DataSourceDescriptor ds = ((DBNDatabaseNode) element).getDataSourceContainer();
if (ds != null) {
return UIUtils.getConnectionColor(ds.getConnectionInfo());
return UIUtils.getConnectionColor(ds.getConnectionConfiguration());
}
}
return null;
......
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2DataSourceProvider.java
浏览文件 @ 49d1f794
......@@ -22,7 +22,7 @@ import com.ibm.db2.jcc.DB2BaseDataSource;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ext.db2.model.DB2DataSource;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBPDriver;
import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceProvider;
......@@ -66,7 +66,7 @@ public class DB2DataSourceProvider extends JDBCDataSourceProvider {
}
@Override
public String getConnectionURL(DBPDriver driver, DBPConnectionInfo connectionInfo)
public String getConnectionURL(DBPDriver driver, DBPConnectionConfiguration connectionInfo)
{
StringBuilder url = new StringBuilder(128);
url.append("jdbc:db2://").append(connectionInfo.getHostName());
......
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
浏览文件 @ 49d1f794
......@@ -41,7 +41,7 @@ import org.jkiss.dbeaver.ext.db2.model.security.DB2AuthIDType;
import org.jkiss.dbeaver.ext.db2.model.security.DB2Grantee;
import org.jkiss.dbeaver.ext.db2.model.security.DB2GranteeCache;
import org.jkiss.dbeaver.ext.db2.model.security.DB2Role;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPDataSourceInfo;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.exec.DBCException;
......@@ -169,7 +169,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
this.activeSchemaName = JDBCUtils.queryString(session, GET_CURRENT_USER);
if (this.activeSchemaName == null) {
LOG.warn("Special registers 'CURRENT SCHEMA' and 'SYSTEM_USER' both returned null. Use connection username as active schema");
this.activeSchemaName = getContainer().getActualConnectionInfo().getUserName();
this.activeSchemaName = getContainer().getActualConnectionConfiguration().getUserName();
}
}
......@@ -212,7 +212,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
// -----------------------
@Override
protected String getConnectionUserName(DBPConnectionInfo connectionInfo)
protected String getConnectionUserName(DBPConnectionConfiguration connectionInfo)
{
return connectionInfo.getUserName();
}
......
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionPage.java
浏览文件 @ 49d1f794
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.ext.db2.Activator;
import org.jkiss.dbeaver.ext.db2.DB2Constants;
import org.jkiss.dbeaver.ext.db2.DB2Messages;
import org.jkiss.dbeaver.ui.ICompositeDialogPage;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract;
......@@ -150,7 +150,7 @@ public class DB2ConnectionPage extends ConnectionPageAbstract implements ICompos
public void loadSettings()
{
// Load values from new connection info
DBPConnectionInfo connectionInfo = site.getActiveDataSource().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
if (hostText != null) {
hostText.setText(CommonUtils.notEmpty(connectionInfo.getHostName()));
}
......@@ -175,7 +175,7 @@ public class DB2ConnectionPage extends ConnectionPageAbstract implements ICompos
@Override
public void saveSettings(DataSourceDescriptor dataSource)
{
DBPConnectionInfo connectionInfo = dataSource.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = dataSource.getConnectionConfiguration();
if (hostText != null) {
connectionInfo.setHostName(hostText.getText());
}
......
plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/views/DB2ConnectionTracePage.java
浏览文件 @ 49d1f794
......@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;
import org.jkiss.dbeaver.ext.db2.DB2Constants;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract;
......@@ -145,7 +145,7 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
public void loadSettings()
{
// Load values from new connection info
DBPConnectionInfo connectionInfo = site.getActiveDataSource().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
Map<Object,Object> connectionProperties = connectionInfo.getProperties();
// Settings
......@@ -179,7 +179,7 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
public void saveSettings(DataSourceDescriptor dataSource)
{
super.saveSettings(dataSource);
Map<Object, Object> connectionProperties = dataSource.getConnectionInfo().getProperties();
Map<Object, Object> connectionProperties = dataSource.getConnectionConfiguration().getProperties();
{
connectionProperties.put(DB2Constants.PROP_TRACE_ENABLED, enableTraceCheck.getSelection());
......@@ -194,7 +194,7 @@ public class DB2ConnectionTracePage extends ConnectionPageAbstract
}
connectionProperties.put(DB2Constants.PROP_TRACE_LEVEL, traceLevel);
}
saveConnectionURL(dataSource.getConnectionInfo());
saveConnectionURL(dataSource.getConnectionConfiguration());
}
}
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/GenericDataSourceProvider.java
浏览文件 @ 49d1f794
......@@ -24,7 +24,7 @@ import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ext.generic.model.GenericDataSource;
import org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBPDriver;
import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceProvider;
......@@ -86,7 +86,7 @@ public class GenericDataSourceProvider extends JDBCDataSourceProvider {
}
@Override
public String getConnectionURL(DBPDriver driver, DBPConnectionInfo connectionInfo)
public String getConnectionURL(DBPDriver driver, DBPConnectionConfiguration connectionInfo)
{
try {
DriverDescriptor.MetaURL metaURL = DriverDescriptor.parseSampleURL(driver.getSampleURL());
......
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataSource.java
浏览文件 @ 49d1f794
......@@ -174,7 +174,7 @@ public class GenericDataSource extends JDBCDataSource
try {
final Driver driver = getDriverInstance(VoidProgressMonitor.INSTANCE); // Use void monitor - driver already loaded
if (driver != null) {
driver.connect(getContainer().getActualConnectionInfo().getUrl() + paramShutdown, null);
driver.connect(getContainer().getActualConnectionConfiguration().getUrl() + paramShutdown, null);
}
} catch (Exception e) {
log.debug(e);
......
plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/views/GenericConnectionPage.java
浏览文件 @ 49d1f794
......@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.*;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ext.generic.GenericMessages;
import org.jkiss.dbeaver.ui.ICompositeDialogPage;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPDriver;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DriverDescriptor;
......@@ -363,7 +363,7 @@ public class GenericConnectionPage extends ConnectionPageAbstract implements ICo
public void loadSettings()
{
// Load values from new connection info
DBPConnectionInfo connectionInfo = site.getActiveDataSource().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
if (site.getDriver() != null) {
driverText.setText(CommonUtils.toString(site.getDriver().getFullName()));
}
......@@ -422,7 +422,7 @@ public class GenericConnectionPage extends ConnectionPageAbstract implements ICo
@Override
public void saveSettings(DataSourceDescriptor dataSource)
{
DBPConnectionInfo connectionInfo = dataSource.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = dataSource.getConnectionConfiguration();
final Set<String> properties = metaURL == null ? Collections.<String>emptySet() : metaURL.getAvailableProperties();
if (hostText != null && properties.contains(DriverDescriptor.PROP_HOST)) {
......
plugins/org.jkiss.dbeaver.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizard.java
浏览文件 @ 49d1f794
......@@ -24,7 +24,7 @@ import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.*;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.SelectObjectDialog;
......@@ -158,7 +158,7 @@ public abstract class ConfigImportWizard extends Wizard implements IImportWizard
name = connectionInfo.getAlias() + " " + (i + 1);
}
DBPConnectionInfo config = new DBPConnectionInfo();
DBPConnectionConfiguration config = new DBPConnectionConfiguration();
config.setProperties(connectionInfo.getProperties());
config.setUrl(connectionInfo.getUrl());
config.setUserName(connectionInfo.getUser());
......
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLDataSourceProvider.java
浏览文件 @ 49d1f794
......@@ -82,7 +82,7 @@ public class MySQLDataSourceProvider extends JDBCDataSourceProvider implements D
}
@Override
public String getConnectionURL(DBPDriver driver, DBPConnectionInfo connectionInfo)
public String getConnectionURL(DBPDriver driver, DBPConnectionConfiguration connectionInfo)
{
String trustStorePath = "D:/temp/ssl/test-cert-store";
......
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLDatabaseWizardPageSettings.java
浏览文件 @ 49d1f794
......@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.jkiss.dbeaver.model.DBConstants;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.encode.EncryptionException;
import org.jkiss.dbeaver.registry.encode.SecuredPasswordEncrypter;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -49,7 +49,7 @@ public abstract class MySQLDatabaseWizardPageSettings<WIZARD extends AbstractToo
{
try {
final SecuredPasswordEncrypter encrypter = new SecuredPasswordEncrypter();
final DBPConnectionInfo connectionInfo = wizard.getConnectionInfo();
final DBPConnectionConfiguration connectionInfo = wizard.getConnectionInfo();
final String authProperty = DBConstants.INTERNAL_PROP_PREFIX + "-auth-" + wizard.getDatabaseObject().getName() + "@";
String authUser = null;
String authPassword = null;
......
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java
浏览文件 @ 49d1f794
......@@ -22,7 +22,7 @@ import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.tools.IExternalTool;
import org.jkiss.dbeaver.ui.dialogs.tools.AbstractToolWizard;
......@@ -60,7 +60,7 @@ public class MySQLToolScript implements IExternalTool
if (toolWizard.isVerbose()) {
cmd.add("-v");
}
DBPConnectionInfo connectionInfo = toolWizard.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = toolWizard.getConnectionInfo();
cmd.add("--host=" + connectionInfo.getHostName());
if (!CommonUtils.isEmpty(connectionInfo.getHostPort())) {
cmd.add("--port=" + connectionInfo.getHostPort());
......
plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/views/MySQLConnectionPage.java
浏览文件 @ 49d1f794
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.ext.mysql.Activator;
import org.jkiss.dbeaver.ext.mysql.MySQLConstants;
import org.jkiss.dbeaver.ext.mysql.MySQLMessages;
import org.jkiss.dbeaver.ui.ICompositeDialogPage;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPDriver;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -191,7 +191,7 @@ public class MySQLConnectionPage extends ConnectionPageAbstract implements IComp
}
// Load values from new connection info
DBPConnectionInfo connectionInfo = site.getActiveDataSource().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
if (hostText != null) {
if (!CommonUtils.isEmpty(connectionInfo.getHostName())) {
hostText.setText(connectionInfo.getHostName());
......@@ -230,7 +230,7 @@ public class MySQLConnectionPage extends ConnectionPageAbstract implements IComp
@Override
public void saveSettings(DataSourceDescriptor dataSource)
{
DBPConnectionInfo connectionInfo = dataSource.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = dataSource.getConnectionConfiguration();
if (hostText != null) {
connectionInfo.setHostName(hostText.getText());
}
......
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleDataSourceProvider.java
浏览文件 @ 49d1f794
......@@ -66,7 +66,7 @@ public class OracleDataSourceProvider extends JDBCDataSourceProvider implements
}
@Override
public String getConnectionURL(DBPDriver driver, DBPConnectionInfo connectionInfo)
public String getConnectionURL(DBPDriver driver, DBPConnectionConfiguration connectionInfo)
{
//boolean isOCI = OCIUtils.isOciDriver(driver);
OracleConstants.ConnectionType connectionType;
......
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @ 49d1f794
......@@ -116,7 +116,7 @@ public class OracleDataSource extends JDBCDataSource
}
@Override
protected String getConnectionUserName(DBPConnectionInfo connectionInfo)
protected String getConnectionUserName(DBPConnectionConfiguration connectionInfo)
{
final Object role = connectionInfo.getProperty(OracleConstants.PROP_INTERNAL_LOGON);
return role == null ? connectionInfo.getUserName() : connectionInfo.getUserName() + " AS " + role;
......@@ -230,7 +230,7 @@ public class OracleDataSource extends JDBCDataSource
final JDBCSession session = getDefaultContext(true).openSession(monitor, DBCExecutionPurpose.META, "Load data source meta info");
try {
// Set session settings
DBPConnectionInfo connectionInfo = getContainer().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = getContainer().getConnectionConfiguration();
Object sessionLanguage = connectionInfo.getProperty(OracleConstants.PROP_SESSION_LANGUAGE);
if (sessionLanguage != null) {
try {
......@@ -580,7 +580,7 @@ public class OracleDataSource extends JDBCDataSource
protected JDBCStatement prepareObjectsStatement(JDBCSession session, OracleDataSource owner) throws SQLException
{
StringBuilder schemasQuery = new StringBuilder();
boolean manyObjects = "false".equals(owner.getContainer().getConnectionInfo().getProperty(OracleConstants.PROP_CHECK_SCHEMA_CONTENT));
boolean manyObjects = "false".equals(owner.getContainer().getConnectionConfiguration().getProperty(OracleConstants.PROP_CHECK_SCHEMA_CONTENT));
schemasQuery.append("SELECT U.USERNAME FROM SYS.ALL_USERS U\n");
// if (owner.isAdmin() && false) {
......
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleScriptExecuteWizard.java
浏览文件 @ 49d1f794
......@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.ext.oracle.model.OracleDataSource;
import org.jkiss.dbeaver.ext.oracle.model.dict.OracleConnectionType;
import org.jkiss.dbeaver.ext.oracle.oci.OCIUtils;
import org.jkiss.dbeaver.ext.oracle.oci.OracleHomeDescriptor;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
import org.jkiss.dbeaver.ui.dialogs.tools.AbstractScriptExecuteWizard;
......@@ -78,7 +78,7 @@ class OracleScriptExecuteWizard extends AbstractScriptExecuteWizard<OracleDataSo
{
List<String> cmd = new ArrayList<String>();
fillProcessParameters(cmd);
DBPConnectionInfo conInfo = getConnectionInfo();
DBPConnectionConfiguration conInfo = getConnectionInfo();
String url;
if ("TNS".equals(conInfo.getProperty(OracleConstants.PROP_CONNECTION_TYPE))) { //$NON-NLS-1$
url = conInfo.getServerName();
......
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionExtraPage.java
浏览文件 @ 49d1f794
......@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Group;
import org.jkiss.dbeaver.ext.oracle.model.OracleConstants;
import org.jkiss.dbeaver.ext.oracle.model.dict.OracleLanguage;
import org.jkiss.dbeaver.ext.oracle.model.dict.OracleTerritory;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract;
......@@ -119,7 +119,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
//oraHomeSelector.setVisible(isOCI);
// Load values from new connection info
DBPConnectionInfo connectionInfo = site.getActiveDataSource().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
Map<Object,Object> connectionProperties = connectionInfo.getProperties();
// Settings
......@@ -148,7 +148,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
public void saveSettings(DataSourceDescriptor dataSource)
{
super.saveSettings(dataSource);
Map<Object, Object> connectionProperties = dataSource.getConnectionInfo().getProperties();
Map<Object, Object> connectionProperties = dataSource.getConnectionConfiguration().getProperties();
{
// Settings
......@@ -172,7 +172,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
OracleConstants.PROP_ALWAYS_SHOW_DBA,
String.valueOf(showDBAAlwaysCheckbox.getSelection()));
}
saveConnectionURL(dataSource.getConnectionInfo());
saveConnectionURL(dataSource.getConnectionConfiguration());
}
}
plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionPage.java
浏览文件 @ 49d1f794
......@@ -33,7 +33,7 @@ import org.jkiss.dbeaver.ext.oracle.model.dict.OracleConnectionType;
import org.jkiss.dbeaver.ext.oracle.oci.OCIUtils;
import org.jkiss.dbeaver.ext.oracle.oci.OracleHomeDescriptor;
import org.jkiss.dbeaver.ui.ICompositeDialogPage;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.ClientHomesSelector;
......@@ -103,7 +103,7 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
public void widgetSelected(SelectionEvent e)
{
connectionType = (OracleConstants.ConnectionType) connectionTypeFolder.getSelection()[0].getData();
site.getActiveDataSource().getConnectionInfo().setProperty(OracleConstants.PROP_CONNECTION_TYPE, connectionType.name());
site.getActiveDataSource().getConnectionConfiguration().setProperty(OracleConstants.PROP_CONNECTION_TYPE, connectionType.name());
updateUI();
}
});
......@@ -317,7 +317,7 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
//oraHomeSelector.setVisible(isOCI);
// Load values from new connection info
DBPConnectionInfo connectionInfo = site.getActiveDataSource().getConnectionInfo();
DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
Map<Object,Object> connectionProperties = connectionInfo.getProperties();
final Object sidService = connectionProperties.get(OracleConstants.PROP_SID_SERVICE);
......@@ -385,7 +385,7 @@ public class OracleConnectionPage extends ConnectionPageAbstract implements ICom
@Override
public void saveSettings(DataSourceDescriptor dataSource)
{
DBPConnectionInfo connectionInfo = dataSource.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = dataSource.getConnectionConfiguration();
super.saveSettings(dataSource);
Map<Object, Object> connectionProperties = connectionInfo.getProperties();
//if (isOCI) {
......
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/WMIDataSourceProvider.java
浏览文件 @ 49d1f794
......@@ -47,14 +47,14 @@ public class WMIDataSourceProvider implements DBPDataSourceProvider {
public DBPPropertyDescriptor[] getConnectionProperties(
DBRRunnableContext runnableContext,
DBPDriver driver,
DBPConnectionInfo connectionInfo) throws DBException
DBPConnectionConfiguration connectionInfo) throws DBException
{
driver.validateFilesPresence(runnableContext);
return null;
}
@Override
public String getConnectionURL(DBPDriver driver, DBPConnectionInfo connectionInfo)
public String getConnectionURL(DBPDriver driver, DBPConnectionConfiguration connectionInfo)
{
return
"wmi://" + connectionInfo.getServerName() +
......
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSource.java
浏览文件 @ 49d1f794
......@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.ext.wmi.model;
import org.eclipse.core.runtime.IAdaptable;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBPDataSourceInfo;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
......@@ -118,7 +118,7 @@ public class WMIDataSource implements DBPDataSource, DBCExecutionContext, SQLDat
@Override
public void initialize(@NotNull DBRProgressMonitor monitor) throws DBException
{
final DBPConnectionInfo connectionInfo = container.getActualConnectionInfo();
final DBPConnectionConfiguration connectionInfo = container.getActualConnectionConfiguration();
try {
WMIService service = WMIService.connect(
connectionInfo.getServerName(),
......
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/views/WMIConnectionPage.java
浏览文件 @ 49d1f794
......@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.jkiss.dbeaver.ext.wmi.Activator;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract;
......@@ -156,7 +156,7 @@ public class WMIConnectionPage extends ConnectionPageAbstract
{
// Load values from new connection info
DataSourceDescriptor activeDataSource = site.getActiveDataSource();
DBPConnectionInfo connectionInfo = activeDataSource.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = activeDataSource.getConnectionConfiguration();
if (connectionInfo.getHostName() == null) {
connectionInfo.setHostName(DEFAULT_HOST);
}
......@@ -183,7 +183,7 @@ public class WMIConnectionPage extends ConnectionPageAbstract
@Override
public void saveSettings(DataSourceDescriptor dataSource)
{
DBPConnectionInfo connectionInfo = dataSource.getConnectionInfo();
DBPConnectionConfiguration connectionInfo = dataSource.getConnectionConfiguration();
if (hostText != null) {
connectionInfo.setHostName(hostText.getText());
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或