Refactor EncryptAlgorithmMetaData (#30174)

apache · Feb 18, 2024 · c778777 · c778777
1 parent 33ec6a8
commit c778777
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 42 deletions.
diff --git a/...-generator/src/main/resources/template/java/TestQueryAssistedShardingEncryptAlgorithm.ftl b/...-generator/src/main/resources/template/java/TestQueryAssistedShardingEncryptAlgorithm.ftl
@@ -38,8 +38,7 @@ public final class TestQueryAssistedShardingEncryptAlgorithm implements EncryptA
     @Override
     public void init(final Properties props) {
         this.properties = props;
-        EncryptAlgorithmMetaData algorithmMetaData = new EncryptAlgorithmMetaData();
-        algorithmMetaData.setSupportDecrypt(false);
+        EncryptAlgorithmMetaData algorithmMetaData = new EncryptAlgorithmMetaData(false, true, false);
         metaData = algorithmMetaData;
     }
 

diff --git a/...ypt/api/src/main/java/org/apache/shardingsphere/encrypt/spi/EncryptAlgorithmMetaData.java b/...ypt/api/src/main/java/org/apache/shardingsphere/encrypt/spi/EncryptAlgorithmMetaData.java
@@ -18,20 +18,18 @@
 package org.apache.shardingsphere.encrypt.spi;
 
 import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
 
 /**
  * Encrypt algorithm meta data.
  */
+@RequiredArgsConstructor
 @Getter
 public final class EncryptAlgorithmMetaData {
 
-    @Setter
-    private boolean supportDecrypt = true;
+    private final boolean supportDecrypt;
 
-    @Setter
-    private boolean supportEquivalentFilter = true;
+    private final boolean supportEquivalentFilter;
 
-    @Setter
-    private boolean supportLike;
+    private final boolean supportLike;
 }
diff --git a/...ava/org/apache/shardingsphere/encrypt/algorithm/assisted/MD5AssistedEncryptAlgorithm.java b/...ava/org/apache/shardingsphere/encrypt/algorithm/assisted/MD5AssistedEncryptAlgorithm.java
@@ -42,9 +42,7 @@ public final class MD5AssistedEncryptAlgorithm implements EncryptAlgorithm {
     @Override
     public void init(final Properties props) {
         this.salt = props.getProperty(SALT_KEY, "");
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, true, false);
     }
 
     @Override

diff --git a/...c/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java b/...c/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java
@@ -57,7 +57,7 @@ public final class AESEncryptAlgorithm implements EncryptAlgorithm {
 
     @Override
     public void init(final Properties props) {
-        metaData = new EncryptAlgorithmMetaData();
+        metaData = new EncryptAlgorithmMetaData(true, true, false);
         secretKey = createSecretKey(props);
     }
 

diff --git a/.../src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreEncryptAlgorithmFixture.java b/.../src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreEncryptAlgorithmFixture.java
@@ -25,7 +25,7 @@
 @Getter
 public final class CoreEncryptAlgorithmFixture implements EncryptAlgorithm {
 
-    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData();
+    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData(true, true, false);
 
     @Override
     public String encrypt(final Object plainValue, final EncryptContext encryptContext) {

diff --git a/...a/org/apache/shardingsphere/encrypt/fixture/CoreQueryAssistedEncryptAlgorithmFixture.java b/...a/org/apache/shardingsphere/encrypt/fixture/CoreQueryAssistedEncryptAlgorithmFixture.java
@@ -31,9 +31,7 @@ public final class CoreQueryAssistedEncryptAlgorithmFixture implements EncryptAl
 
     @Override
     public void init(final Properties props) {
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, true, false);
     }
 
     @Override

diff --git a/.../java/org/apache/shardingsphere/encrypt/fixture/CoreQueryLikeEncryptAlgorithmFixture.java b/.../java/org/apache/shardingsphere/encrypt/fixture/CoreQueryLikeEncryptAlgorithmFixture.java
@@ -31,11 +31,7 @@ public final class CoreQueryLikeEncryptAlgorithmFixture implements EncryptAlgori
 
     @Override
     public void init(final Properties props) {
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportLike(true);
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        encryptAlgorithmMetaData.setSupportEquivalentFilter(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, false, true);
     }
 
     @Override

diff --git a/...apache/shardingsphere/encrypt/distsql/handler/fixture/DistSQLEncryptAlgorithmFixture.java b/...apache/shardingsphere/encrypt/distsql/handler/fixture/DistSQLEncryptAlgorithmFixture.java
@@ -25,7 +25,7 @@
 @Getter
 public final class DistSQLEncryptAlgorithmFixture implements EncryptAlgorithm {
 
-    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData();
+    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData(true, true, false);
 
     @Override
     public String encrypt(final Object plainValue, final EncryptContext encryptContext) {

diff --git a/...rg/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCEncryptAlgorithmFixture.java b/...rg/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCEncryptAlgorithmFixture.java
@@ -25,7 +25,7 @@
 @Getter
 public final class JDBCEncryptAlgorithmFixture implements EncryptAlgorithm {
 
-    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData();
+    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData(true, true, false);
 
     @Override
     public String encrypt(final Object plainValue, final EncryptContext encryptContext) {

diff --git a/...rdingsphere/test/e2e/driver/fixture/encrypt/JDBCQueryAssistedEncryptAlgorithmFixture.java b/...rdingsphere/test/e2e/driver/fixture/encrypt/JDBCQueryAssistedEncryptAlgorithmFixture.java
@@ -31,9 +31,7 @@ public final class JDBCQueryAssistedEncryptAlgorithmFixture implements EncryptAl
 
     @Override
     public void init(final Properties props) {
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, true, false);
     }
 
     @Override

diff --git a/...c/test/java/org/apache/shardingsphere/test/e2e/fixture/ITEncryptLikeAlgorithmFixture.java b/...c/test/java/org/apache/shardingsphere/test/e2e/fixture/ITEncryptLikeAlgorithmFixture.java
@@ -69,10 +69,7 @@ public void init(final Properties props) {
         mask = createMask(props);
         start = createStart(props);
         charIndexes = createCharIndexes(props);
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportLike(true);
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, true, true);
     }
 
     private int createDelta(final Properties props) {

diff --git a/.../shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java b/.../shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
@@ -25,7 +25,7 @@
 @Getter
 public final class RewriteNormalEncryptAlgorithmFixture implements EncryptAlgorithm {
 
-    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData();
+    private final EncryptAlgorithmMetaData metaData = new EncryptAlgorithmMetaData(true, true, false);
 
     @Override
     public String encrypt(final Object plainValue, final EncryptContext encryptContext) {

diff --git a/...ngsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java b/...ngsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
@@ -31,9 +31,7 @@ public final class RewriteQueryAssistedEncryptAlgorithmFixture implements Encryp
 
     @Override
     public void init(final Properties props) {
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, true, false);
     }
 
     @Override

diff --git a/...ardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java b/...ardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
@@ -31,10 +31,7 @@ public final class RewriteQueryLikeEncryptAlgorithmFixture implements EncryptAlg
 
     @Override
     public void init(final Properties props) {
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportLike(true);
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, true, true);
     }
 
     @Override

diff --git a/...sphere/test/natived/jdbc/commons/algorithm/TestQueryAssistedShardingEncryptAlgorithm.java b/...sphere/test/natived/jdbc/commons/algorithm/TestQueryAssistedShardingEncryptAlgorithm.java
@@ -34,9 +34,7 @@ public final class TestQueryAssistedShardingEncryptAlgorithm implements EncryptA
     @Override
     public void init(final Properties props) {
         this.properties = props;
-        EncryptAlgorithmMetaData encryptAlgorithmMetaData = new EncryptAlgorithmMetaData();
-        encryptAlgorithmMetaData.setSupportDecrypt(false);
-        metaData = encryptAlgorithmMetaData;
+        metaData = new EncryptAlgorithmMetaData(false, true, false);
     }
 
     @Override