Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2025 DBeaver Corp and others
* Copyright (C) 2010-2026 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -108,9 +108,10 @@ public void initialize(@NotNull DBRProgressMonitor monitor) throws DBException {

@Override
protected void initializeContextState(
@NotNull DBRProgressMonitor monitor,
@NotNull JDBCExecutionContext context,
JDBCExecutionContext initFrom) throws DBException {
@NotNull DBRProgressMonitor monitor,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext initFrom
) throws DBException {

super.initializeContextState(monitor, context, initFrom);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.jkiss.dbeaver.ext.athena.model;

import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ModelPreferences;
import org.jkiss.dbeaver.ext.generic.model.GenericDataSource;
Expand All @@ -43,11 +44,12 @@ public AthenaDataSource(DBRProgressMonitor monitor, DBPDataSourceContainer conta
super(monitor, container, metaModel, new AthenaSQLDialect());
}

@NotNull
@Override
protected Map<String, String> getInternalConnectionProperties(
@NotNull DBRProgressMonitor monitor,
@NotNull DBPDriver driver,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext context,
@NotNull String purpose,
@NotNull DBPConnectionConfiguration connectionInfo
) throws DBCException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.jkiss.dbeaver.ext.bigquery.model;

import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ext.generic.model.GenericDataSource;
import org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel;
Expand All @@ -43,8 +44,9 @@ public BQDataSource(
super(monitor, container, metaModel, new BQSQLDialect());
}

@NotNull
@Override
protected JDBCExecutionContext createExecutionContext(JDBCRemoteInstance instance, String type) throws DBCException {
protected JDBCExecutionContext createExecutionContext(@NotNull JDBCRemoteInstance instance, @NotNull String type) throws DBCException {
return new BQExecutionContext(instance, type);
}

Expand All @@ -66,7 +68,7 @@ protected String getConnectionURL(@NotNull DBPConnectionConfiguration connection
protected Map<String, String> getInternalConnectionProperties(
@NotNull DBRProgressMonitor monitor,
@NotNull DBPDriver driver,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext context,
@NotNull String purpose,
@NotNull DBPConnectionConfiguration connectionInfo
) throws DBCException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,12 @@ ClickhouseTableEngine getEngineByName(@NotNull String engineName) {

@NotNull
@Override
protected Properties getAllConnectionProperties(@NotNull DBRProgressMonitor monitor, @NotNull JDBCExecutionContext context, @NotNull
String purpose, @NotNull DBPConnectionConfiguration connectionInfo) throws DBCException {
protected Properties getAllConnectionProperties(
@NotNull DBRProgressMonitor monitor,
@Nullable JDBCExecutionContext context,
@NotNull String purpose,
@NotNull DBPConnectionConfiguration connectionInfo
) throws DBCException {
Properties properties = super.getAllConnectionProperties(monitor, context, purpose, connectionInfo);
if (!CommonUtils.toBoolean(properties.getProperty(ClickhouseConstants.PROP_USE_SERVER_TIME_ZONE)) &&
!CommonUtils.toBoolean(properties.getProperty(ClickhouseConstants.PROP_USE_TIME_ZONE))
Expand Down Expand Up @@ -185,7 +189,7 @@ private void configureSession(@NotNull Properties properties) {

// Canceling
@Override
public void cancelStatementExecute(DBRProgressMonitor monitor, JDBCStatement statement) throws DBException {
public void cancelStatementExecute(@NotNull DBRProgressMonitor monitor, @NotNull JDBCStatement statement) throws DBException {
try {

super.cancelStatementExecute(monitor, statement);
Expand Down Expand Up @@ -273,8 +277,9 @@ public String getDefaultDataTypeName(@NotNull DBPDataKind dataKind) {
}
}

@NotNull
@Override
protected DBPDataSourceInfo createDataSourceInfo(DBRProgressMonitor monitor, @NotNull JDBCDatabaseMetaData metaData) {
protected DBPDataSourceInfo createDataSourceInfo(@NotNull DBRProgressMonitor monitor, @NotNull JDBCDatabaseMetaData metaData) {
return new ClickhouseDataSourceInfo(metaData);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,11 @@ public DBSObject refreshObject(@NotNull DBRProgressMonitor monitor) throws DBExc
}

@Override
protected void initializeContextState(DBRProgressMonitor monitor,
JDBCExecutionContext context,
JDBCExecutionContext initFrom)
throws DBException {
protected void initializeContextState(
@NotNull DBRProgressMonitor monitor,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext initFrom
) throws DBException {
super.initializeContextState(monitor, context, initFrom);

if (outputReader == null && checkSupportDbmsOutput(monitor, context)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2025 DBeaver Corp and others
* Copyright (C) 2010-2026 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -57,13 +57,18 @@ public DamengDataSource(DBRProgressMonitor monitor, DBPDataSourceContainer conta
super(monitor, container, metaModel, new DamengSQLDialect());
}

@NotNull
@Override
protected JDBCExecutionContext createExecutionContext(JDBCRemoteInstance instance, String type) {
protected JDBCExecutionContext createExecutionContext(@NotNull JDBCRemoteInstance instance, @NotNull String type) {
return new DamengExecutionContext(instance, type);
}

@Override
protected void initializeContextState(DBRProgressMonitor monitor, JDBCExecutionContext context, JDBCExecutionContext initFrom) throws DBException {
protected void initializeContextState(
@NotNull DBRProgressMonitor monitor,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext initFrom
) throws DBException {
DamengExecutionContext executionContext = (DamengExecutionContext) context;
if (initFrom == null) {
executionContext.refreshDefaults(monitor, true);
Expand All @@ -76,8 +81,9 @@ protected void initializeContextState(DBRProgressMonitor monitor, JDBCExecutionC
}
}

@NotNull
@Override
protected DBPDataSourceInfo createDataSourceInfo(DBRProgressMonitor monitor, JDBCDatabaseMetaData metaData) {
protected DBPDataSourceInfo createDataSourceInfo(@NotNull DBRProgressMonitor monitor, @NotNull JDBCDatabaseMetaData metaData) {
return new JDBCDataSourceInfo(metaData);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.jkiss.dbeaver.ext.databend.model;

import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.ext.generic.model.GenericDataSource;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
Expand Down Expand Up @@ -46,9 +47,12 @@ protected boolean isPopulateClientAppName() {

@NotNull
@Override
protected Properties getAllConnectionProperties(@NotNull DBRProgressMonitor monitor, @NotNull JDBCExecutionContext context, @NotNull
String purpose, @NotNull DBPConnectionConfiguration connectionInfo)
throws DBCException {
protected Properties getAllConnectionProperties(
@NotNull DBRProgressMonitor monitor,
@Nullable JDBCExecutionContext context,
@NotNull String purpose,
@NotNull DBPConnectionConfiguration connectionInfo
) throws DBCException {
Properties properties = super.getAllConnectionProperties(monitor, context, purpose, connectionInfo);

final DBWHandlerConfiguration sslConfig = getContainer().getActualConnectionConfiguration().getHandler("databend-ssl");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public boolean isLegacyDriver() {
@Override
protected Properties getAllConnectionProperties(
@NotNull DBRProgressMonitor monitor,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext context,
@NotNull String purpose,
@NotNull DBPConnectionConfiguration connectionInfo
) throws DBCException {
Expand Down Expand Up @@ -111,8 +111,9 @@ protected void initializeContextState(
}
}

@NotNull
@Override
public JDBCExecutionContext createExecutionContext(JDBCRemoteInstance instance, String type) {
public JDBCExecutionContext createExecutionContext(@NotNull JDBCRemoteInstance instance, @NotNull String type) {
return new DatabricksExecutionContext(instance, type);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.jkiss.dbeaver.ext.db2.i.model;

import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.ModelPreferences;
Expand Down Expand Up @@ -46,11 +47,12 @@ public DB2IDataSource(DBRProgressMonitor monitor, DBPDataSourceContainer contain
super(monitor, container, metaModel, new DB2ISQLDialect());
}

@NotNull
@Override
protected Map<String, String> getInternalConnectionProperties(
@NotNull DBRProgressMonitor monitor,
@NotNull DBPDriver driver,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext context,
@NotNull String purpose,
@NotNull DBPConnectionConfiguration connectionInfo
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2024 DBeaver Corp and others
* Copyright (C) 2010-2026 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,11 +46,12 @@ public DB2ZOSDataSource(DBRProgressMonitor monitor, DBPDataSourceContainer conta
super(monitor, container, metaModel, new DB2ZOSSQLDialect());
}

@NotNull
@Override
protected Map<String, String> getInternalConnectionProperties(
@NotNull DBRProgressMonitor monitor,
@NotNull DBPDriver driver,
@NotNull JDBCExecutionContext context,
@Nullable JDBCExecutionContext context,
@NotNull String purpose,
@NotNull DBPConnectionConfiguration connectionInfo
) {
Expand Down
Loading
Loading