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 5977fcbc6bd Rename AbstractColumnMatchedShadowAlgorithm (#20162)
5977fcbc6bd is described below
commit 5977fcbc6bd0b613d2803b0fff7f013cebf81be3
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 14 14:43:43 2022 +0800
Rename AbstractColumnMatchedShadowAlgorithm (#20162)
---
docs/document/content/dev-manual/shadow.cn.md | 10 +++++-----
docs/document/content/dev-manual/shadow.en.md | 4 ++--
...lgorithm.java => AbstractColumnMatchedShadowAlgorithm.java} | 10 +++++-----
...owAlgorithm.java => ColumnRegexMatchedShadowAlgorithm.java} | 6 +++---
...owAlgorithm.java => ColumnValueMatchedShadowAlgorithm.java} | 6 +++---
.../org.apache.shardingsphere.shadow.spi.ShadowAlgorithm | 4 ++--
.../shadow/column/ColumnRegexMatchShadowAlgorithmTest.java | 8 ++++----
.../shadow/column/ColumnValueMatchShadowAlgorithmTest.java | 8 ++++----
...amlShadowRuleAlgorithmProviderConfigurationSwapperTest.java | 4 ++--
.../spring/boot/PropertiesShadowSpringBootStarterTest.java | 4 ++--
.../shadow/spring/boot/YmlShadowSpringBootStarterTest.java | 8 ++++----
.../spring/namespace/ShadowAlgorithmSpringNamespaceTest.java | 8 ++++----
12 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/docs/document/content/dev-manual/shadow.cn.md
b/docs/document/content/dev-manual/shadow.cn.md
index e2afc2a80aa..5b3d4444917 100644
--- a/docs/document/content/dev-manual/shadow.cn.md
+++ b/docs/document/content/dev-manual/shadow.cn.md
@@ -19,8 +19,8 @@ chapter = true
### ShadowAlgorithm
-| *已知实现类* | *详细说明* | *完全限定的类名* |
-|-------------------------------- |----------------------- | ------------- |
-| ColumnValueMatchShadowAlgorithm | 基于字段值匹配影子算法 |
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java)
|
-| ColumnRegexMatchShadowAlgorithm | 基于字段值正则匹配影子算法 |
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java)
|
-| SimpleHintShadowAlgorithm | 基于 Hint 简单匹配影子算法 |
[`org.apache.shardingsphere.shadow.algorithm.shadow.hint.SimpleHintShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/SimpleHintShadowAlgorithm.java)
|
+| *已知实现类* | *详细说明* | *完全限定的类名* |
+| --------------------------------- | ---------------------- | ------------- |
+| ColumnValueMatchedShadowAlgorithm | 基于字段值匹配影子算法 |
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchedShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchedShadowAlgorithm.java)
|
+| ColumnRegexMatchedShadowAlgorithm | 基于字段值正则匹配影子算法 |
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchedShadowAlgorithm.java)
|
+| SimpleHintShadowAlgorithm | 基于 Hint 简单匹配影子算法 |
[`org.apache.shardingsphere.shadow.algorithm.shadow.hint.SimpleHintShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/SimpleHintShadowAlgorithm.java)
|
diff --git a/docs/document/content/dev-manual/shadow.en.md
b/docs/document/content/dev-manual/shadow.en.md
index 0865eb3528e..4cd8f139b8e 100644
--- a/docs/document/content/dev-manual/shadow.en.md
+++ b/docs/document/content/dev-manual/shadow.en.md
@@ -19,6 +19,6 @@ Shadow algorithm's definition
| *Configuration Type* | *Description*
| *Fully-qualified class name* |
| -------------------- |
------------------------------------------------------ |
---------------------------- |
-| VALUE_MATCH | Match shadow algorithms based on field values
|
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java)
|
-| REGEX_MATCH | Regular matching shadow algorithm based on field
value |
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java)
|
+| VALUE_MATCH | Match shadow algorithms based on field values
|
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchedShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchedShadowAlgorithm.java)
|
+| REGEX_MATCH | Regular matching shadow algorithm based on field
value |
[`org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchedShadowAlgorithm.java)
|
| SIMPLE_HINT | Simple match shadow algorithm based on Hint
|
[`org.apache.shardingsphere.shadow.algorithm.shadow.hint.SimpleHintShadowAlgorithm`](https://github.com/apache/shardingsphere/blob/master/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/SimpleHintShadowAlgorithm.java)
|
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchShadowAlgorithm.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java
similarity index 89%
rename from
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchShadowAlgorithm.java
rename to
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java
index ae30b44d44a..c573b1f3109 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchShadowAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java
@@ -28,9 +28,9 @@ import java.util.Optional;
import java.util.Properties;
/**
- * Abstract column match shadow algorithm.
+ * Abstract column matched shadow algorithm.
*/
-public abstract class AbstractColumnMatchShadowAlgorithm implements
ColumnShadowAlgorithm<Comparable<?>> {
+public abstract class AbstractColumnMatchedShadowAlgorithm implements
ColumnShadowAlgorithm<Comparable<?>> {
private static final String COLUMN_PROPS_KEY = "column";
@@ -65,16 +65,16 @@ public abstract class AbstractColumnMatchShadowAlgorithm
implements ColumnShadow
}
@Override
- public boolean isShadow(final PreciseColumnShadowValue<Comparable<?>>
shadowValue) {
+ public final boolean isShadow(final
PreciseColumnShadowValue<Comparable<?>> shadowValue) {
String table = shadowValue.getLogicTableName();
String column = shadowValue.getColumnName();
Comparable<?> value = shadowValue.getValue();
if (shadowOperationType == shadowValue.getShadowOperationType() &&
shadowColumn.equals(column)) {
ShadowValueValidator.validate(table, column, value);
- return isMatchValue(value);
+ return matchesShadowValue(value);
}
return false;
}
- protected abstract boolean isMatchValue(Comparable<?> value);
+ protected abstract boolean matchesShadowValue(Comparable<?> value);
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchedShadowAlgorithm.java
similarity index 88%
rename from
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java
rename to
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchedShadowAlgorithm.java
index e57105c7abd..18bcb671452 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchedShadowAlgorithm.java
@@ -23,9 +23,9 @@ import java.util.Properties;
import java.util.regex.Pattern;
/**
- * Column regex match shadow algorithm.
+ * Column regex matched shadow algorithm.
*/
-public final class ColumnRegexMatchShadowAlgorithm extends
AbstractColumnMatchShadowAlgorithm {
+public final class ColumnRegexMatchedShadowAlgorithm extends
AbstractColumnMatchedShadowAlgorithm {
private static final String REGEX_PROPS_KEY = "regex";
@@ -44,7 +44,7 @@ public final class ColumnRegexMatchShadowAlgorithm extends
AbstractColumnMatchSh
}
@Override
- protected boolean isMatchValue(final Comparable<?> value) {
+ protected boolean matchesShadowValue(final Comparable<?> value) {
return regex.matcher(String.valueOf(value)).matches();
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchedShadowAlgorithm.java
similarity index 88%
rename from
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java
rename to
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchedShadowAlgorithm.java
index d6a2e1a578f..8ddc6b532a3 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchedShadowAlgorithm.java
@@ -22,9 +22,9 @@ import com.google.common.base.Preconditions;
import java.util.Properties;
/**
- * Column value match shadow algorithm.
+ * Column value matched shadow algorithm.
*/
-public final class ColumnValueMatchShadowAlgorithm extends
AbstractColumnMatchShadowAlgorithm {
+public final class ColumnValueMatchedShadowAlgorithm extends
AbstractColumnMatchedShadowAlgorithm {
private static final String VALUE_PROPS_KEY = "value";
@@ -43,7 +43,7 @@ public final class ColumnValueMatchShadowAlgorithm extends
AbstractColumnMatchSh
}
@Override
- protected boolean isMatchValue(final Comparable<?> value) {
+ protected boolean matchesShadowValue(final Comparable<?> value) {
return shadowValue.equals(String.valueOf(value));
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/resources/META-INF/services/org.apache.shardingsphere.shadow.spi.ShadowAlgorithm
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/resources/META-INF/services/org.apache.shardingsphere.shadow.spi.ShadowAlgorithm
index 3ceaf70320b..7a557c074c2 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/resources/META-INF/services/org.apache.shardingsphere.shadow.spi.ShadowAlgorithm
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/resources/META-INF/services/org.apache.shardingsphere.shadow.spi.ShadowAlgorithm
@@ -16,5 +16,5 @@
#
org.apache.shardingsphere.shadow.algorithm.shadow.hint.SimpleHintShadowAlgorithm
-org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm
-org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchShadowAlgorithm
+org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm
+org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchedShadowAlgorithm
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithmTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithmTest.java
index b32901cdb47..7f650ef7e5b 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithmTest.java
@@ -31,19 +31,19 @@ public final class ColumnRegexMatchShadowAlgorithmTest
extends AbstractColumnSha
@Test
public void assertIsShadow() {
- ColumnRegexMatchShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
+ ColumnRegexMatchedShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
createPreciseColumnShadowValuesFalseCase().forEach(each ->
assertFalse(shadowAlgorithm.isShadow(each)));
createPreciseColumnShadowValuesTrueCase().forEach(each ->
assertTrue(shadowAlgorithm.isShadow(each)));
}
@Test(expected = ShadowAlgorithmException.class)
public void assertExceptionCase() {
- ColumnRegexMatchShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
+ ColumnRegexMatchedShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
createPreciseColumnShadowValuesExceptionCase().forEach(each ->
assertFalse(shadowAlgorithm.isShadow(each)));
}
- private ColumnRegexMatchShadowAlgorithm createShadowAlgorithm() {
- return (ColumnRegexMatchShadowAlgorithm)
ShadowAlgorithmFactory.newInstance(new AlgorithmConfiguration("REGEX_MATCH",
createProperties()));
+ private ColumnRegexMatchedShadowAlgorithm createShadowAlgorithm() {
+ return (ColumnRegexMatchedShadowAlgorithm)
ShadowAlgorithmFactory.newInstance(new AlgorithmConfiguration("REGEX_MATCH",
createProperties()));
}
private Properties createProperties() {
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithmTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithmTest.java
index 31860a59e19..464f6322edc 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithmTest.java
@@ -31,19 +31,19 @@ public final class ColumnValueMatchShadowAlgorithmTest
extends AbstractColumnSha
@Test
public void assertIsShadow() {
- ColumnValueMatchShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
+ ColumnValueMatchedShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
createPreciseColumnShadowValuesTrueCase().forEach(each ->
assertTrue(shadowAlgorithm.isShadow(each)));
createPreciseColumnShadowValuesFalseCase().forEach(each ->
assertFalse(shadowAlgorithm.isShadow(each)));
}
@Test(expected = ShadowAlgorithmException.class)
public void assertExceptionCase() {
- ColumnValueMatchShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
+ ColumnValueMatchedShadowAlgorithm shadowAlgorithm =
createShadowAlgorithm();
createPreciseColumnShadowValuesExceptionCase().forEach(each ->
assertFalse(shadowAlgorithm.isShadow(each)));
}
- private ColumnValueMatchShadowAlgorithm createShadowAlgorithm() {
- return (ColumnValueMatchShadowAlgorithm)
ShadowAlgorithmFactory.newInstance(new AlgorithmConfiguration("VALUE_MATCH",
createProperties()));
+ private ColumnValueMatchedShadowAlgorithm createShadowAlgorithm() {
+ return (ColumnValueMatchedShadowAlgorithm)
ShadowAlgorithmFactory.newInstance(new AlgorithmConfiguration("VALUE_MATCH",
createProperties()));
}
private Properties createProperties() {
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowRuleAlgorithmProviderConfigurationSwapperTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowRuleAlgorithmProviderConfigurationSwapperTest.java
index 47a5152aa7f..5eaa3a4514d 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowRuleAlgorithmProviderConfigurationSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/YamlShadowRuleAlgorithmProviderConfigurationSwapperTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shadow.yaml.swapper;
import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.shadow.algorithm.config.AlgorithmProvidedShadowRuleConfiguration;
-import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm;
+import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm;
import
org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
import
org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
import org.apache.shardingsphere.shadow.spi.ShadowAlgorithm;
@@ -67,7 +67,7 @@ public final class
YamlShadowRuleAlgorithmProviderConfigurationSwapperTest {
AlgorithmProvidedShadowRuleConfiguration result = new
AlgorithmProvidedShadowRuleConfiguration();
result.getDataSources().put("shadow-data-source", new
ShadowDataSourceConfiguration("ds", "ds-shadow"));
result.getTables().put("t_order", new
ShadowTableConfiguration(Collections.singletonList("shadow-data-source"),
Arrays.asList("user-id-match-algorithm", "note-algorithm")));
- result.getShadowAlgorithms().put("user-id-match-algorithm", new
ColumnRegexMatchShadowAlgorithm());
+ result.getShadowAlgorithms().put("user-id-match-algorithm", new
ColumnRegexMatchedShadowAlgorithm());
return result;
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
index 0146b68fe85..12b438b01b3 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.shadow.spring.boot;
import
org.apache.shardingsphere.shadow.algorithm.config.AlgorithmProvidedShadowRuleConfiguration;
-import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm;
+import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm;
import
org.apache.shardingsphere.shadow.algorithm.shadow.hint.SimpleHintShadowAlgorithm;
import
org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
import
org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
@@ -58,7 +58,7 @@ public class PropertiesShadowSpringBootStarterTest {
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm userIdMatchAlgorithm =
shadowAlgorithms.get("user-id-match-algorithm");
- assertThat(userIdMatchAlgorithm,
instanceOf(ColumnRegexMatchShadowAlgorithm.class));
+ assertThat(userIdMatchAlgorithm,
instanceOf(ColumnRegexMatchedShadowAlgorithm.class));
assertThat(userIdMatchAlgorithm.getType(), is("REGEX_MATCH"));
assertThat(userIdMatchAlgorithm.getProps().getProperty("operation"),
is("insert"));
assertThat(userIdMatchAlgorithm.getProps().getProperty("column"),
is("user_id"));
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
index 623e44c0de0..f2a4bb8e63e 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.spring.boot;
import
org.apache.shardingsphere.shadow.algorithm.config.AlgorithmProvidedShadowRuleConfiguration;
-import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm;
-import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchShadowAlgorithm;
+import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm;
+import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchedShadowAlgorithm;
import
org.apache.shardingsphere.shadow.algorithm.shadow.hint.SimpleHintShadowAlgorithm;
import
org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
import
org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
@@ -58,13 +58,13 @@ public class YmlShadowSpringBootStarterTest {
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm userIdRegexMatchAlgorithm =
shadowAlgorithms.get("user-id-regex-match-algorithm");
- assertThat(userIdRegexMatchAlgorithm,
instanceOf(ColumnRegexMatchShadowAlgorithm.class));
+ assertThat(userIdRegexMatchAlgorithm,
instanceOf(ColumnRegexMatchedShadowAlgorithm.class));
assertThat(userIdRegexMatchAlgorithm.getType(), is("REGEX_MATCH"));
assertThat(userIdRegexMatchAlgorithm.getProps().getProperty("operation"),
is("insert"));
assertThat(userIdRegexMatchAlgorithm.getProps().getProperty("column"),
is("user_id"));
assertThat(userIdRegexMatchAlgorithm.getProps().getProperty("regex"),
is("[1]"));
ShadowAlgorithm userIdValueMatchAlgorithm =
shadowAlgorithms.get("user-id-value-match-algorithm");
- assertThat(userIdValueMatchAlgorithm,
instanceOf(ColumnValueMatchShadowAlgorithm.class));
+ assertThat(userIdValueMatchAlgorithm,
instanceOf(ColumnValueMatchedShadowAlgorithm.class));
assertThat(userIdValueMatchAlgorithm.getType(), is("VALUE_MATCH"));
assertThat(userIdValueMatchAlgorithm.getProps().getProperty("operation"),
is("insert"));
assertThat(userIdValueMatchAlgorithm.getProps().getProperty("column"),
is("user_id"));
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
index cfb1365ea25..eecf8aee63b 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.spring.namespace;
import
org.apache.shardingsphere.shadow.algorithm.config.AlgorithmProvidedShadowRuleConfiguration;
-import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm;
-import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchShadowAlgorithm;
+import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchedShadowAlgorithm;
+import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnValueMatchedShadowAlgorithm;
import
org.apache.shardingsphere.shadow.algorithm.shadow.hint.SimpleHintShadowAlgorithm;
import
org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
import
org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
@@ -52,13 +52,13 @@ public final class ShadowAlgorithmSpringNamespaceTest
extends AbstractJUnit4Spri
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm userIdRegexMatchAlgorithm =
shadowAlgorithms.get("user-id-regex-match-algorithm");
- assertThat(userIdRegexMatchAlgorithm,
instanceOf(ColumnRegexMatchShadowAlgorithm.class));
+ assertThat(userIdRegexMatchAlgorithm,
instanceOf(ColumnRegexMatchedShadowAlgorithm.class));
assertThat(userIdRegexMatchAlgorithm.getType(), is("REGEX_MATCH"));
assertThat(userIdRegexMatchAlgorithm.getProps().getProperty("operation"),
is("insert"));
assertThat(userIdRegexMatchAlgorithm.getProps().getProperty("column"),
is("user_id"));
assertThat(userIdRegexMatchAlgorithm.getProps().getProperty("regex"),
is("[1]"));
ShadowAlgorithm userIdValueMatchAlgorithm =
shadowAlgorithms.get("user-id-value-match-algorithm");
- assertThat(userIdValueMatchAlgorithm,
instanceOf(ColumnValueMatchShadowAlgorithm.class));
+ assertThat(userIdValueMatchAlgorithm,
instanceOf(ColumnValueMatchedShadowAlgorithm.class));
assertThat(userIdValueMatchAlgorithm.getType(), is("VALUE_MATCH"));
assertThat(userIdValueMatchAlgorithm.getProps().getProperty("operation"),
is("insert"));
assertThat(userIdValueMatchAlgorithm.getProps().getProperty("column"),
is("user_id"));
