This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit c4509d6fae3daa01df3ec35190e7f80b178e4dff Author: CCweixiao <[email protected]> AuthorDate: Fri May 27 19:21:15 2022 +0800 [feture-2140] Fix code formatting issues. --- .../manager/engineplugin/jdbc/ConnectionManager.java | 19 +++++++++++++------ .../jdbc/constant/JDBCEngineConnConstant.java | 3 ++- .../engineplugin/jdbc/ConnectionManagerTest.java | 8 +++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java index 00f2678db..60d54188f 100644 --- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java +++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java @@ -19,6 +19,7 @@ package org.apache.linkis.manager.engineplugin.jdbc; import org.apache.linkis.hadoop.common.utils.KerberosUtils; import org.apache.linkis.manager.engineplugin.jdbc.conf.JDBCConfiguration; +import org.apache.linkis.manager.engineplugin.jdbc.constant.JDBCEngineConnConstant; import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.dbcp.BasicDataSourceFactory; @@ -26,7 +27,6 @@ import org.apache.commons.lang.StringUtils; import javax.sql.DataSource; -import org.apache.linkis.manager.engineplugin.jdbc.constant.JDBCEngineConnConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -126,7 +126,8 @@ public class ConnectionManager { protected DataSource createDataSources(Map<String, String> properties) throws SQLException { String url = getJdbcUrl(properties); String username = properties.getOrDefault(JDBCEngineConnConstant.JDBC_USERNAME, ""); - String password = StringUtils.trim(properties.getOrDefault(JDBCEngineConnConstant.JDBC_PASSWORD, "")); + String password = + StringUtils.trim(properties.getOrDefault(JDBCEngineConnConstant.JDBC_PASSWORD, "")); int index = url.indexOf(":") + 1; String dbType = url.substring(index, url.indexOf(":", index)); Properties props = new Properties(); @@ -143,7 +144,8 @@ public class ConnectionManager { if (isKerberosAuthType(properties)) { String jdbcProxyUser = properties.get(JDBCEngineConnConstant.JDBC_PROXY_USER); // need proxy user - String proxyUserProperty = properties.get(JDBCEngineConnConstant.JDBC_PROXY_USER_PROPERTY); + String proxyUserProperty = + properties.get(JDBCEngineConnConstant.JDBC_PROXY_USER_PROPERTY); if (StringUtils.isNotBlank(proxyUserProperty)) { url = url.concat(";").concat(proxyUserProperty + "=" + jdbcProxyUser); props.put("url", url); @@ -186,8 +188,11 @@ public class ConnectionManager { connection = getConnection(url, properties); break; case KERBEROS: - final String keytab = properties.get(JDBCEngineConnConstant.JDBC_KERBEROS_AUTH_TYPE_KEYTAB_LOCATION); - final String principal = properties.get(JDBCEngineConnConstant.JDBC_KERBEROS_AUTH_TYPE_PRINCIPAL); + final String keytab = + properties.get( + JDBCEngineConnConstant.JDBC_KERBEROS_AUTH_TYPE_KEYTAB_LOCATION); + final String principal = + properties.get(JDBCEngineConnConstant.JDBC_KERBEROS_AUTH_TYPE_PRINCIPAL); KerberosUtils.createKerberosSecureConfiguration(keytab, principal); connection = getConnection(url, properties); break; @@ -250,7 +255,9 @@ public class ConnectionManager { } private JdbcAuthType getJdbcAuthType(Map<String, String> properties) { - String authType = properties.getOrDefault(JDBCEngineConnConstant.JDBC_AUTH_TYPE, USERNAME.getAuthType()); + String authType = + properties.getOrDefault( + JDBCEngineConnConstant.JDBC_AUTH_TYPE, USERNAME.getAuthType()); if (authType == null || authType.trim().length() == 0) return of(USERNAME.getAuthType()); return of(authType.trim().toUpperCase()); } diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/constant/JDBCEngineConnConstant.java b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/constant/JDBCEngineConnConstant.java index 54fa76fc4..dae6edaac 100644 --- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/constant/JDBCEngineConnConstant.java +++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/constant/JDBCEngineConnConstant.java @@ -23,7 +23,8 @@ public class JDBCEngineConnConstant { public static final String JDBC_PASSWORD = "wds.linkis.jdbc.password"; public static final String JDBC_AUTH_TYPE = "wds.linkis.jdbc.auth.type"; public static final String JDBC_KERBEROS_AUTH_TYPE_PRINCIPAL = "wds.linkis.jdbc.principal"; - public static final String JDBC_KERBEROS_AUTH_TYPE_KEYTAB_LOCATION = "wds.linkis.jdbc.keytab.location"; + public static final String JDBC_KERBEROS_AUTH_TYPE_KEYTAB_LOCATION = + "wds.linkis.jdbc.keytab.location"; public static final String JDBC_PROXY_USER_PROPERTY = "wds.linkis.jdbc.proxy.user.property"; public static final String JDBC_PROXY_USER = "wds.linkis.jdbc.proxy.user"; } diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManagerTest.java b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManagerTest.java index 80dc2860c..d26f8ba06 100644 --- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManagerTest.java +++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/test/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManagerTest.java @@ -17,9 +17,11 @@ package org.apache.linkis.manager.engineplugin.jdbc; +import org.apache.linkis.manager.engineplugin.jdbc.constant.JDBCEngineConnConstant; + import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.dbcp.BasicDataSourceFactory; -import org.apache.linkis.manager.engineplugin.jdbc.constant.JDBCEngineConnConstant; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -54,7 +56,6 @@ public class ConnectionManagerTest { rs.close(); statement.close(); conn.close(); - } @Test @@ -71,7 +72,8 @@ public class ConnectionManagerTest { properties.put("testOnBorrow", false); properties.put("testWhileIdle", true); properties.put("validationQuery", "select 1"); - BasicDataSource dataSource = (BasicDataSource) BasicDataSourceFactory.createDataSource(properties); + BasicDataSource dataSource = + (BasicDataSource) BasicDataSourceFactory.createDataSource(properties); Connection conn = dataSource.getConnection(); Statement statement = conn.createStatement(); ResultSet rs = statement.executeQuery("show databases;"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
