Skip to content

Commit e55c321

Browse files
ruanwenjunruanwenjun
authored
[Fix-17464] Use Driver to create jdbc connection (#18033)
1 parent 278335c commit e55c321

File tree

28 files changed

+311
-153
lines changed

28 files changed

+311
-153
lines changed

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/DataSourceProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public interface DataSourceProcessor {
5151
/**
5252
* create BaseDataSourceParamDTO by connectionJson
5353
*
54-
* @param connectionJson see{@link org.apache.dolphinscheduler.dao.entity.Datasource}
54+
* @param connectionJson see{@link org.apache.dolphinscheduler.dao.entity.DataSource}
5555
* @return {@link BaseDataSourceParamDTO}
5656
*/
5757
BaseDataSourceParamDTO createDatasourceParamDTO(String connectionJson);
@@ -67,7 +67,7 @@ public interface DataSourceProcessor {
6767
* deserialize json to datasource connection param
6868
*
6969
* @param connectionJson {@code org.apache.dolphinscheduler.dao.entity.DataSource.connectionParams}
70-
* @return {@link BaseConnectionParam}
70+
* @return {@link ConnectionParam}
7171
*/
7272
ConnectionParam createConnectionParams(String connectionJson);
7373

@@ -96,7 +96,7 @@ public interface DataSourceProcessor {
9696
* @return {@link Connection}
9797
*/
9898
// todo: Change to return a ConnectionWrapper
99-
Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException, IOException;
99+
Connection getConnection(ConnectionParam connectionParam) throws SQLException, IOException;
100100

101101
/**
102102
* test connection

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/JdbcConnectionProvider.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.dolphinscheduler.plugin.datasource.api.datasource;
19+
20+
import java.sql.Connection;
21+
import java.sql.SQLException;
22+
23+
public interface JdbcConnectionProvider {
24+
25+
Connection getConnection() throws SQLException;
26+
27+
}

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/JdbcDriverConnectionProvider.java‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.dolphinscheduler.plugin.datasource.api.datasource;
19+
20+
import java.sql.Connection;
21+
import java.sql.Driver;
22+
import java.sql.SQLException;
23+
import java.util.Properties;
24+
25+
import lombok.Builder;
26+
27+
@Builder
28+
public class JdbcDriverConnectionProvider implements JdbcConnectionProvider {
29+
30+
private final String jdbcDriverClassName;
31+
private final String jdbcUrl;
32+
private final String username;
33+
private final String password;
34+
private final Properties properties;
35+
36+
@Override
37+
public Connection getConnection() throws SQLException {
38+
try {
39+
Driver driver = (Driver) Class.forName(jdbcDriverClassName).getDeclaredConstructor().newInstance();
40+
Properties p = new Properties(properties);
41+
if (username != null) {
42+
p.setProperty("user", username);
43+
}
44+
if (password != null) {
45+
p.setProperty("password", password);
46+
}
47+
return driver.connect(jdbcUrl, p);
48+
} catch (ReflectiveOperationException e) {
49+
throw new SQLException("Failed to instantiate driver: " + jdbcDriverClassName, e);
50+
}
51+
}
52+
}

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/src/main/java/org/apache/dolphinscheduler/plugin/datasource/athena/param/AthenaDataSourceProcessor.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor;
2424
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
2525
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor;
26+
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.JdbcDriverConnectionProvider;
2627
import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
2728
import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
2829
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
@@ -31,7 +32,6 @@
3132
import org.apache.commons.collections4.MapUtils;
3233

3334
import java.sql.Connection;
34-
import java.sql.DriverManager;
3535
import java.sql.SQLException;
3636
import java.util.ArrayList;
3737
import java.util.List;
@@ -106,11 +106,15 @@ public String getJdbcUrl(ConnectionParam connectionParam) {
106106
}
107107

108108
@Override
109-
public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
109+
public Connection getConnection(ConnectionParam connectionParam) throws SQLException {
110110
AthenaConnectionParam athenaConnectionParam = (AthenaConnectionParam) connectionParam;
111-
Class.forName(this.getDatasourceDriver());
112-
return DriverManager.getConnection(this.getJdbcUrl(connectionParam),
113-
athenaConnectionParam.getUser(), PasswordUtils.decodePassword(athenaConnectionParam.getPassword()));
111+
return JdbcDriverConnectionProvider.builder()
112+
.jdbcDriverClassName(getDatasourceDriver())
113+
.jdbcUrl(getJdbcUrl(athenaConnectionParam))
114+
.username(athenaConnectionParam.getUser())
115+
.password(PasswordUtils.decodePassword(athenaConnectionParam.getPassword()))
116+
.build()
117+
.getConnection();
114118
}
115119

116120
@Override

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/azuresql/param/AzureSQLDataSourceProcessor.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor;
2424
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
2525
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor;
26+
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.JdbcDriverConnectionProvider;
2627
import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
2728
import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
2829
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
@@ -33,7 +34,6 @@
3334

3435
import java.net.MalformedURLException;
3536
import java.sql.Connection;
36-
import java.sql.DriverManager;
3737
import java.sql.SQLException;
3838
import java.util.HashMap;
3939
import java.util.HashSet;
@@ -147,16 +147,20 @@ public String getJdbcUrl(ConnectionParam connectionParam) {
147147
}
148148

149149
@Override
150-
public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
150+
public Connection getConnection(ConnectionParam connectionParam) throws SQLException {
151151
AzureSQLConnectionParam azureSQLConnectionParam = (AzureSQLConnectionParam) connectionParam;
152152
// token access way
153153
if (azureSQLConnectionParam.getMode().equals(AzureSQLAuthMode.ACCESSTOKEN)) {
154154
return tokenGetConnection(azureSQLConnectionParam);
155155
}
156156
// normal way
157-
Class.forName(getDatasourceDriver());
158-
return DriverManager.getConnection(getJdbcUrl(connectionParam), azureSQLConnectionParam.getUser(),
159-
PasswordUtils.decodePassword(azureSQLConnectionParam.getPassword()));
157+
return JdbcDriverConnectionProvider.builder()
158+
.jdbcDriverClassName(getDatasourceDriver())
159+
.jdbcUrl(getJdbcUrl(azureSQLConnectionParam))
160+
.username(azureSQLConnectionParam.getUser())
161+
.password(PasswordUtils.decodePassword(azureSQLConnectionParam.getPassword()))
162+
.build()
163+
.getConnection();
160164
}
161165

162166
@Override
@@ -255,6 +259,7 @@ private String processAuthMode(String jdbcUrl, AzureSQLDataSourceParamDTO param)
255259

256260
/**
257261
* by default, add {"trustServerCertificate":true} to other to deal with SSL trust issue
262+
*
258263
* @param paramDTO
259264
*/
260265
private void checkTrustServerCertificate(BaseDataSourceParamDTO paramDTO) {

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/src/main/java/org/apache/dolphinscheduler/plugin/datasource/clickhouse/param/ClickHouseDataSourceProcessor.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor;
2424
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
2525
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor;
26+
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.JdbcDriverConnectionProvider;
2627
import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
2728
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
2829
import org.apache.dolphinscheduler.spi.enums.DbType;
2930

3031
import org.apache.commons.collections4.MapUtils;
3132

3233
import java.sql.Connection;
33-
import java.sql.DriverManager;
3434
import java.sql.SQLException;
3535
import java.util.ArrayList;
3636
import java.util.List;
@@ -109,12 +109,15 @@ public String getJdbcUrl(ConnectionParam connectionParam) {
109109
}
110110

111111
@Override
112-
public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
112+
public Connection getConnection(ConnectionParam connectionParam) throws SQLException {
113113
ClickHouseConnectionParam clickhouseConnectionParam = (ClickHouseConnectionParam) connectionParam;
114-
Class.forName(getDatasourceDriver());
115-
return DriverManager.getConnection(getJdbcUrl(clickhouseConnectionParam),
116-
clickhouseConnectionParam.getUser(),
117-
PasswordUtils.decodePassword(clickhouseConnectionParam.getPassword()));
114+
return JdbcDriverConnectionProvider.builder()
115+
.jdbcDriverClassName(getDatasourceDriver())
116+
.jdbcUrl(getJdbcUrl(clickhouseConnectionParam))
117+
.username(clickhouseConnectionParam.getUser())
118+
.password(PasswordUtils.decodePassword(clickhouseConnectionParam.getPassword()))
119+
.build()
120+
.getConnection();
118121
}
119122

120123
@Override

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/src/main/java/org/apache/dolphinscheduler/plugin/datasource/dameng/param/DamengDataSourceProcessor.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor;
2424
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
2525
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor;
26+
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.JdbcDriverConnectionProvider;
2627
import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
2728
import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
2829
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
@@ -32,7 +33,6 @@
3233
import org.apache.commons.lang3.StringUtils;
3334

3435
import java.sql.Connection;
35-
import java.sql.DriverManager;
3636
import java.sql.SQLException;
3737
import java.util.ArrayList;
3838
import java.util.List;
@@ -116,11 +116,15 @@ public String getJdbcUrl(ConnectionParam connectionParam) {
116116
}
117117

118118
@Override
119-
public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
119+
public Connection getConnection(ConnectionParam connectionParam) throws SQLException {
120120
DamengConnectionParam damengConnectionParam = (DamengConnectionParam) connectionParam;
121-
Class.forName(getDatasourceDriver());
122-
return DriverManager.getConnection(getJdbcUrl(damengConnectionParam), damengConnectionParam.getUser(),
123-
PasswordUtils.decodePassword(damengConnectionParam.getPassword()));
121+
return JdbcDriverConnectionProvider.builder()
122+
.jdbcDriverClassName(getDatasourceDriver())
123+
.jdbcUrl(getJdbcUrl(damengConnectionParam))
124+
.username(damengConnectionParam.getUser())
125+
.password(PasswordUtils.decodePassword(damengConnectionParam.getPassword()))
126+
.build()
127+
.getConnection();
124128
}
125129

126130
@Override

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/main/java/org/apache/dolphinscheduler/plugin/datasource/databend/param/DatabendDataSourceProcessor.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor;
2424
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
2525
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor;
26+
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.JdbcDriverConnectionProvider;
2627
import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
2728
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
2829
import org.apache.dolphinscheduler.spi.enums.DbType;
2930

3031
import org.apache.commons.collections4.MapUtils;
3132

3233
import java.sql.Connection;
33-
import java.sql.DriverManager;
3434
import java.sql.SQLException;
3535
import java.util.ArrayList;
3636
import java.util.List;
@@ -108,12 +108,15 @@ public String getJdbcUrl(ConnectionParam connectionParam) {
108108
}
109109

110110
@Override
111-
public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
111+
public Connection getConnection(ConnectionParam connectionParam) throws SQLException {
112112
DatabendConnectionParam databendConnectionParam = (DatabendConnectionParam) connectionParam;
113-
Class.forName(getDatasourceDriver());
114-
return DriverManager.getConnection(getJdbcUrl(databendConnectionParam),
115-
databendConnectionParam.getUser(),
116-
PasswordUtils.decodePassword(databendConnectionParam.getPassword()));
113+
return JdbcDriverConnectionProvider.builder()
114+
.jdbcDriverClassName(getDatasourceDriver())
115+
.jdbcUrl(getJdbcUrl(databendConnectionParam))
116+
.username(databendConnectionParam.getUser())
117+
.password(PasswordUtils.decodePassword(databendConnectionParam.getPassword()))
118+
.build()
119+
.getConnection();
117120
}
118121

119122
@Override

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/src/main/java/org/apache/dolphinscheduler/plugin/datasource/db2/param/Db2DataSourceProcessor.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor;
2424
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
2525
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor;
26+
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.JdbcDriverConnectionProvider;
2627
import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
2728
import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
2829
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
@@ -31,7 +32,6 @@
3132
import org.apache.commons.collections4.MapUtils;
3233

3334
import java.sql.Connection;
34-
import java.sql.DriverManager;
3535
import java.sql.SQLException;
3636
import java.util.ArrayList;
3737
import java.util.List;
@@ -105,11 +105,15 @@ public String getJdbcUrl(ConnectionParam connectionParam) {
105105
}
106106

107107
@Override
108-
public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
108+
public Connection getConnection(ConnectionParam connectionParam) throws SQLException {
109109
Db2ConnectionParam db2ConnectionParam = (Db2ConnectionParam) connectionParam;
110-
Class.forName(getDatasourceDriver());
111-
return DriverManager.getConnection(getJdbcUrl(db2ConnectionParam),
112-
db2ConnectionParam.getUser(), PasswordUtils.decodePassword(db2ConnectionParam.getPassword()));
110+
return JdbcDriverConnectionProvider.builder()
111+
.jdbcDriverClassName(getDatasourceDriver())
112+
.jdbcUrl(getJdbcUrl(db2ConnectionParam))
113+
.username(db2ConnectionParam.getUser())
114+
.password(PasswordUtils.decodePassword(db2ConnectionParam.getPassword()))
115+
.build()
116+
.getConnection();
113117
}
114118

115119
@Override

‎dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dolphindb/src/main/java/org/apache/dolphinscheduler/plugin/datasource/dolphindb/param/DolphinDBDataSourceProcessor.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor;
2424
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
2525
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor;
26+
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.JdbcDriverConnectionProvider;
2627
import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
2728
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
2829
import org.apache.dolphinscheduler.spi.enums.DbType;
2930

3031
import org.apache.commons.collections4.MapUtils;
3132

3233
import java.sql.Connection;
33-
import java.sql.DriverManager;
3434
import java.sql.SQLException;
3535
import java.util.ArrayList;
3636
import java.util.List;
@@ -118,12 +118,15 @@ public String getJdbcUrl(ConnectionParam connectionParam) {
118118
}
119119

120120
@Override
121-
public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
121+
public Connection getConnection(ConnectionParam connectionParam) throws SQLException {
122122
DolphinDBConnectionParam dolphinDBConnectionParam = (DolphinDBConnectionParam) connectionParam;
123-
Class.forName(getDatasourceDriver());
124-
return DriverManager.getConnection(getJdbcUrl(connectionParam),
125-
dolphinDBConnectionParam.getUser(),
126-
PasswordUtils.decodePassword(dolphinDBConnectionParam.getPassword()));
123+
return JdbcDriverConnectionProvider.builder()
124+
.jdbcDriverClassName(getDatasourceDriver())
125+
.jdbcUrl(getJdbcUrl(dolphinDBConnectionParam))
126+
.username(dolphinDBConnectionParam.getUser())
127+
.password(PasswordUtils.decodePassword(dolphinDBConnectionParam.getPassword()))
128+
.build()
129+
.getConnection();
127130
}
128131

129132
@Override

0 commit comments

Comments
 (0)