fix: To avoid converting null to "null", skip null passwords (#5057)

* Update RestfulApiHelper.java * fix: add missing import * fix: format code using mvn
apache · Dec 29, 2023 · be7b820 · be7b820
1 parent 59e526d
commit be7b820
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...rver/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java b/...rver/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
@@ -66,10 +66,11 @@ public static void encryptPasswordKey(
     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 static void decryptPasswordKey(
     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())));
             }
           }
         });