(shardingsphere) branch master updated: Change AESEncryptAlgorithm, AESCryptographicAlgorithm, MD5AssistedEncryptAlgorithm encrypt value type to Object (#38677)

[chengzhang]

This is an automated email from the ASF dual-hosted git repository.

FlyingZC pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new b454a955c5e Change AESEncryptAlgorithm, AESCryptographicAlgorithm, 
MD5AssistedEncryptAlgorithm encrypt value type to Object (#38677)
b454a955c5e is described below

commit b454a955c5eec8f545a81a59b00719c992f7931a
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Sat May 9 08:49:03 2026 +0800

    Change AESEncryptAlgorithm, AESCryptographicAlgorithm, 
MD5AssistedEncryptAlgorithm encrypt value type to Object (#38677)
---
 .../encrypt/algorithm/assisted/MD5AssistedEncryptAlgorithm.java      | 2 +-
 .../encrypt/algorithm/standard/AESEncryptAlgorithm.java              | 5 ++---
 .../apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java  | 3 ++-
 .../infra/algorithm/cryptographic/aes/AESCryptographicAlgorithm.java | 2 +-
 .../infra/algorithm/messagedigest/spi/MessageDigestAlgorithm.java    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/assisted/MD5AssistedEncryptAlgorithm.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/assisted/MD5AssistedEncryptAlgorithm.java
index 4f9ee3f4497..e779d3f9180 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/assisted/MD5AssistedEncryptAlgorithm.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/assisted/MD5AssistedEncryptAlgorithm.java
@@ -50,7 +50,7 @@ public final class MD5AssistedEncryptAlgorithm implements 
EncryptAlgorithm {
     }
     
     @Override
-    public String encrypt(final Object plainValue, final AlgorithmSQLContext 
algorithmSQLContext) {
+    public Object encrypt(final Object plainValue, final AlgorithmSQLContext 
algorithmSQLContext) {
         return digestAlgorithm.digest(plainValue);
     }
     
diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java
index 4c62e48d769..f12733df0a4 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java
@@ -53,9 +53,8 @@ public final class AESEncryptAlgorithm implements 
EncryptAlgorithm {
     }
     
     @Override
-    public String encrypt(final Object plainValue, final AlgorithmSQLContext 
algorithmSQLContext) {
-        Object result = cryptographicAlgorithm.encrypt(plainValue);
-        return null == result ? null : String.valueOf(result);
+    public Object encrypt(final Object plainValue, final AlgorithmSQLContext 
algorithmSQLContext) {
+        return cryptographicAlgorithm.encrypt(plainValue);
     }
     
     @Override
diff --git 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java
 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java
index 8681901a8ce..ec91fec0e51 100644
--- 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java
+++ 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java
@@ -39,7 +39,8 @@ public final class MD5MaskAlgorithm implements 
MaskAlgorithm<Object, String> {
     @HighFrequencyInvocation
     @Override
     public String mask(final Object plainValue) {
-        return digestAlgorithm.digest(plainValue);
+        Object result = digestAlgorithm.digest(plainValue);
+        return null == result ? null : String.valueOf(result);
     }
     
     @Override
diff --git 
a/infra/algorithm/type/cryptographic/type/aes/src/main/java/org/apache/shardingsphere/infra/algorithm/cryptographic/aes/AESCryptographicAlgorithm.java
 
b/infra/algorithm/type/cryptographic/type/aes/src/main/java/org/apache/shardingsphere/infra/algorithm/cryptographic/aes/AESCryptographicAlgorithm.java
index 489d892f0a4..3fd2061651b 100644
--- 
a/infra/algorithm/type/cryptographic/type/aes/src/main/java/org/apache/shardingsphere/infra/algorithm/cryptographic/aes/AESCryptographicAlgorithm.java
+++ 
b/infra/algorithm/type/cryptographic/type/aes/src/main/java/org/apache/shardingsphere/infra/algorithm/cryptographic/aes/AESCryptographicAlgorithm.java
@@ -45,7 +45,7 @@ public final class AESCryptographicAlgorithm implements 
CryptographicAlgorithm {
     @HighFrequencyInvocation
     @SneakyThrows(GeneralSecurityException.class)
     @Override
-    public String encrypt(final Object plainValue) {
+    public Object encrypt(final Object plainValue) {
         if (null == plainValue) {
             return null;
         }
diff --git 
a/infra/algorithm/type/message-digest/spi/src/main/java/org/apache/shardingsphere/infra/algorithm/messagedigest/spi/MessageDigestAlgorithm.java
 
b/infra/algorithm/type/message-digest/spi/src/main/java/org/apache/shardingsphere/infra/algorithm/messagedigest/spi/MessageDigestAlgorithm.java
index 90d5ef1dad0..121bc1f6318 100644
--- 
a/infra/algorithm/type/message-digest/spi/src/main/java/org/apache/shardingsphere/infra/algorithm/messagedigest/spi/MessageDigestAlgorithm.java
+++ 
b/infra/algorithm/type/message-digest/spi/src/main/java/org/apache/shardingsphere/infra/algorithm/messagedigest/spi/MessageDigestAlgorithm.java
@@ -30,5 +30,5 @@ public interface MessageDigestAlgorithm extends 
ShardingSphereAlgorithm {
      * @param plainValue plain value
      * @return digest value
      */
-    String digest(Object plainValue);
+    Object digest(Object plainValue);
 }