This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new be7b82051 fix: To avoid converting null to "null", skip null passwords
(#5057)
be7b82051 is described below
commit be7b820519e593e9f0ba9c03910fe117101b7d5a
Author: chenmutime <[email protected]>
AuthorDate: Fri Dec 29 17:00:50 2023 +0800
fix: To avoid converting null to "null", skip null passwords (#5057)
* Update RestfulApiHelper.java
* fix: add missing import
* fix: format code using mvn
---
.../datasourcemanager/core/restful/RestfulApiHelper.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
index 9651bb265..72f5c9f89 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
@@ -66,10 +66,11 @@ public class RestfulApiHelper {
keyDefinitionList.forEach(
keyDefinition -> {
if (keyDefinition.getValueType() ==
DataSourceParamKeyDefinition.ValueType.PASSWORD) {
- String password =
String.valueOf(connectParams.get(keyDefinition.getKey()));
+ Object password = connectParams.get(keyDefinition.getKey());
if (null != password) {
connectParams.put(
- keyDefinition.getKey(), new String(new
Base64().encode(password.getBytes())));
+ keyDefinition.getKey(),
+ new String(new
Base64().encode(String.valueOf(password).getBytes())));
}
}
});
@@ -86,10 +87,11 @@ public class RestfulApiHelper {
keyDefinitionList.forEach(
keyDefinition -> {
if (keyDefinition.getValueType() ==
DataSourceParamKeyDefinition.ValueType.PASSWORD) {
- String password =
String.valueOf(connectParams.get(keyDefinition.getKey()));
+ Object password = connectParams.get(keyDefinition.getKey());
if (null != password) {
connectParams.put(
- keyDefinition.getKey(), new String(new
Base64().decode(password.getBytes())));
+ keyDefinition.getKey(),
+ new String(new
Base64().decode(String.valueOf(password).getBytes())));
}
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
