[shardingsphere] branch master updated: Refactor MaskAlgorithmMetaData (#28546)

[duanzhengqiang]

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

duanzhengqiang 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 8187db641fa Refactor MaskAlgorithmMetaData (#28546)
8187db641fa is described below

commit 8187db641fae6f4cb2f678edd5b0c75c964c478a
Author: zhaojinchao <zhaojinc...@apache.org>
AuthorDate: Fri Sep 22 13:49:05 2023 +0800

    Refactor MaskAlgorithmMetaData (#28546)
---
 .../apache/shardingsphere/mask/merge/MaskResultDecoratorEngine.java | 2 +-
 .../apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaData.java | 3 ---
 .../shardingsphere/mask/merge/dql/MaskAlgorithmMetaDataTest.java    | 6 +-----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/MaskResultDecoratorEngine.java
 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/MaskResultDecoratorEngine.java
index 48244e006fe..a49a6236520 100644
--- 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/MaskResultDecoratorEngine.java
+++ 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/MaskResultDecoratorEngine.java
@@ -39,7 +39,7 @@ public final class MaskResultDecoratorEngine implements 
ResultDecoratorEngine<Ma
     public Optional<ResultDecorator<MaskRule>> newInstance(final 
ShardingSphereDatabase database,
                                                            final MaskRule 
maskRule, final ConfigurationProperties props, final SQLStatementContext 
sqlStatementContext) {
         return sqlStatementContext instanceof SelectStatementContext
-                ? Optional.of(new MaskDQLResultDecorator(new 
MaskAlgorithmMetaData(database, maskRule, (SelectStatementContext) 
sqlStatementContext)))
+                ? Optional.of(new MaskDQLResultDecorator(new 
MaskAlgorithmMetaData(maskRule, (SelectStatementContext) sqlStatementContext)))
                 : Optional.empty();
     }
     
diff --git 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaData.java
 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaData.java
index 70b85687899..bdac706adbd 100644
--- 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaData.java
+++ 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaData.java
@@ -21,7 +21,6 @@ import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
 import 
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ColumnProjection;
 import 
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.mask.rule.MaskRule;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
 
@@ -35,8 +34,6 @@ import java.util.Optional;
 @RequiredArgsConstructor
 public final class MaskAlgorithmMetaData {
     
-    private final ShardingSphereDatabase database;
-    
     private final MaskRule maskRule;
     
     private final SelectStatementContext selectStatementContext;
diff --git 
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaDataTest.java
 
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaDataTest.java
index df4475a287d..8ad95a122c4 100644
--- 
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaDataTest.java
+++ 
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/merge/dql/MaskAlgorithmMetaDataTest.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.mask.merge.dql;
 import 
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ColumnProjection;
 import 
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.mask.rule.MaskRule;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -43,9 +42,6 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 class MaskAlgorithmMetaDataTest {
     
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private ShardingSphereDatabase database;
-    
     @Mock
     private MaskRule maskRule;
     
@@ -61,7 +57,7 @@ class MaskAlgorithmMetaDataTest {
         columnProjection.setOriginalTable(new IdentifierValue("t_order"));
         
when(selectStatementContext.getProjectionsContext().getExpandProjections()).thenReturn(Collections.singletonList(columnProjection));
         
when(selectStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singleton("t_order"));
-        Optional<MaskAlgorithm> actual = new MaskAlgorithmMetaData(database, 
maskRule, selectStatementContext).findMaskAlgorithmByColumnIndex(1);
+        Optional<MaskAlgorithm> actual = new MaskAlgorithmMetaData(maskRule, 
selectStatementContext).findMaskAlgorithmByColumnIndex(1);
         assertTrue(actual.isPresent());
         assertThat(actual.get().getType(), is("MD5"));
     }