Skip to content

Commit 685b346

Browse files
strongduanmustrongduanmu
authored
Rename RuleConfigurationCheckEngine to DatabaseRuleConfigurationCheckEngine, RuleConfigurationChecker to DatabaseRuleConfigurationChecker (#34985)
1 parent 0f9c727 commit 685b346

File tree

46 files changed

+62
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+62
-60
lines changed

‎features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/checker/BroadcastRuleConfigurationEmptyChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.broadcast.checker;
1919

2020
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
21-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
21+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2222

2323
/**
2424
* Broadcast rule configuration empty checker.

‎features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker ‎features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker

File renamed without changes.

‎features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/checker/BroadcastRuleConfigurationEmptyCheckerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.broadcast.checker;
1919

2020
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
21-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
21+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2222
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
2323
import org.junit.jupiter.api.BeforeEach;
2424
import org.junit.jupiter.api.Test;

‎features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationChecker.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
2828
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
2929
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
30-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
30+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
3131
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
3232
import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
3333
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -41,7 +41,7 @@
4141
/**
4242
* Encrypt rule configuration checker.
4343
*/
44-
public final class EncryptRuleConfigurationChecker implements RuleConfigurationChecker<EncryptRuleConfiguration> {
44+
public final class EncryptRuleConfigurationChecker implements DatabaseRuleConfigurationChecker<EncryptRuleConfiguration> {
4545

4646
@Override
4747
public void check(final String databaseName, final EncryptRuleConfiguration ruleConfig, final Map<String, DataSource> dataSourceMap, final Collection<ShardingSphereRule> builtRules) {

‎features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationEmptyChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.encrypt.checker.config;
1919

2020
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
21-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
21+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2222

2323
/**
2424
* Encrypt rule configuration empty checker.

‎features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker ‎features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker

File renamed without changes.

‎features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker ‎features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker

File renamed without changes.

‎features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
2626
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
2727
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
28-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
28+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
2929
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
3030
import org.junit.jupiter.api.BeforeEach;
3131
import org.junit.jupiter.api.Test;
@@ -42,11 +42,11 @@
4242
class EncryptRuleConfigurationCheckerTest {
4343

4444
@SuppressWarnings("rawtypes")
45-
private RuleConfigurationChecker checker;
45+
private DatabaseRuleConfigurationChecker checker;
4646

4747
@BeforeEach
4848
void setUp() {
49-
checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(EncryptRuleConfiguration.class)).get(EncryptRuleConfiguration.class);
49+
checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(EncryptRuleConfiguration.class)).get(EncryptRuleConfiguration.class);
5050
}
5151

5252
@SuppressWarnings("unchecked")

‎features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationEmptyCheckerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.encrypt.checker.config;
1919

2020
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
21-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
21+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2222
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
2323
import org.junit.jupiter.api.BeforeEach;
2424
import org.junit.jupiter.api.Test;

‎features/mask/core/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationChecker.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
2121
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
22-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
22+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
2323
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
2424
import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
2525
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -38,7 +38,7 @@
3838
/**
3939
* Mask rule configuration checker.
4040
*/
41-
public final class MaskRuleConfigurationChecker implements RuleConfigurationChecker<MaskRuleConfiguration> {
41+
public final class MaskRuleConfigurationChecker implements DatabaseRuleConfigurationChecker<MaskRuleConfiguration> {
4242

4343
@Override
4444
public void check(final String databaseName, final MaskRuleConfiguration ruleConfig, final Map<String, DataSource> dataSourceMap, final Collection<ShardingSphereRule> builtRules) {

‎features/mask/core/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationEmptyChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.mask.checker;
1919

20-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
20+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2121
import org.apache.shardingsphere.mask.config.MaskRuleConfiguration;
2222

2323
/**

‎features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker ‎features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker

File renamed without changes.

‎features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker ‎features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker

File renamed without changes.

‎features/mask/core/src/test/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationCheckerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.mask.checker;
1919

2020
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
21-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
21+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
2222
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
2323
import org.apache.shardingsphere.mask.config.MaskRuleConfiguration;
2424
import org.apache.shardingsphere.mask.config.rule.MaskColumnRuleConfiguration;
@@ -37,11 +37,11 @@
3737
class MaskRuleConfigurationCheckerTest {
3838

3939
@SuppressWarnings("rawtypes")
40-
private RuleConfigurationChecker checker;
40+
private DatabaseRuleConfigurationChecker checker;
4141

4242
@BeforeEach
4343
void setUp() {
44-
checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(MaskRuleConfiguration.class)).get(MaskRuleConfiguration.class);
44+
checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(MaskRuleConfiguration.class)).get(MaskRuleConfiguration.class);
4545
}
4646

4747
@SuppressWarnings("unchecked")

‎features/mask/core/src/test/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationEmptyCheckerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.mask.checker;
1919

20-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
20+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2121
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
2222
import org.apache.shardingsphere.mask.config.MaskRuleConfiguration;
2323
import org.junit.jupiter.api.BeforeEach;

‎features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.common.base.Strings;
2121
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
2222
import org.apache.shardingsphere.infra.algorithm.loadbalancer.core.LoadBalanceAlgorithm;
23-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
23+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
2424
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
2525
import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
2626
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -40,7 +40,7 @@
4040
/**
4141
* Readwrite-splitting rule configuration checker.
4242
*/
43-
public final class ReadwriteSplittingRuleConfigurationChecker implements RuleConfigurationChecker<ReadwriteSplittingRuleConfiguration> {
43+
public final class ReadwriteSplittingRuleConfigurationChecker implements DatabaseRuleConfigurationChecker<ReadwriteSplittingRuleConfiguration> {
4444

4545
@Override
4646
public void check(final String databaseName, final ReadwriteSplittingRuleConfiguration ruleConfig, final Map<String, DataSource> dataSourceMap, final Collection<ShardingSphereRule> builtRules) {

‎features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationEmptyChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.readwritesplitting.checker;
1919

20-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
20+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2121
import org.apache.shardingsphere.readwritesplitting.config.ReadwriteSplittingRuleConfiguration;
2222

2323
/**

‎features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker ‎features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker

File renamed without changes.

‎features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker ‎features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker

File renamed without changes.

‎features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
2121
import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
22-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
22+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
2323
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
2424
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
2525
import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute;
@@ -57,7 +57,7 @@ class ReadwriteSplittingRuleConfigurationCheckerTest {
5757
@Test
5858
void assertInvalidCheck() {
5959
ReadwriteSplittingRuleConfiguration ruleConfig = createInvalidRuleConfiguration();
60-
RuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
60+
DatabaseRuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
6161
assertThrows(MissingRequiredReadwriteSplittingActualDataSourceException.class, () -> checker.check("test", ruleConfig, Collections.emptyMap(), Collections.emptyList()));
6262
}
6363

@@ -75,7 +75,7 @@ void assertCheckWhenConfigInvalidWriteDataSource() {
7575
List<ReadwriteSplittingDataSourceGroupRuleConfiguration> configs = Arrays.asList(createDataSourceGroupRuleConfiguration(
7676
"write_ds_0", Arrays.asList("read_ds_0", "read_ds_1")), createDataSourceGroupRuleConfiguration("write_ds_2", Arrays.asList("read_ds_0", "read_ds_1")));
7777
when(ruleConfig.getDataSourceGroups()).thenReturn(configs);
78-
RuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
78+
DatabaseRuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
7979
assertThrows(ReadwriteSplittingActualDataSourceNotFoundException.class, () -> checker.check("test", ruleConfig, mockDataSources(), Collections.emptyList()));
8080
}
8181

@@ -85,7 +85,7 @@ void assertCheckWhenConfigInvalidReadDataSource() {
8585
List<ReadwriteSplittingDataSourceGroupRuleConfiguration> configs = Arrays.asList(createDataSourceGroupRuleConfiguration(
8686
"write_ds_0", Arrays.asList("read_ds_0", "read_ds_0")), createDataSourceGroupRuleConfiguration("write_ds_1", Arrays.asList("read_ds_0", "read_ds_0")));
8787
when(ruleConfig.getDataSourceGroups()).thenReturn(configs);
88-
RuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
88+
DatabaseRuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
8989
assertThrows(DuplicateReadwriteSplittingActualDataSourceException.class, () -> checker.check("test", ruleConfig, mockDataSources(), Collections.emptyList()));
9090
}
9191

@@ -96,14 +96,14 @@ void assertCheckWeightLoadBalanceInvalidDataSourceName() {
9696
when(ruleConfig.getDataSourceGroups()).thenReturn(configs);
9797
AlgorithmConfiguration algorithm = new AlgorithmConfiguration("WEIGHT", PropertiesBuilder.build(new Property("read_ds_2", "1"), new Property("read_ds_1", "2")));
9898
when(ruleConfig.getLoadBalancers()).thenReturn(Collections.singletonMap("weight_ds", algorithm));
99-
RuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
99+
DatabaseRuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
100100
assertThrows(AlgorithmInitializationException.class, () -> checker.check("test", ruleConfig, mockDataSources(), Collections.emptyList()));
101101
}
102102

103103
@Test
104104
void assertCheckWhenConfigOtherRulesDatasource() {
105105
ReadwriteSplittingRuleConfiguration ruleConfig = createContainsOtherRulesDatasourceConfiguration();
106-
RuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
106+
DatabaseRuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
107107
ShardingSphereRule rule = mock(ShardingSphereRule.class);
108108
DataSourceMapperRuleAttribute ruleAttribute = mock(DataSourceMapperRuleAttribute.class, RETURNS_DEEP_STUBS);
109109
when(ruleAttribute.getDataSourceMapper().containsKey("otherDatasourceName")).thenReturn(true);
@@ -144,7 +144,7 @@ void assertGetRequiredDataSourceNames() {
144144
ReadwriteSplittingDataSourceGroupRuleConfiguration dataSourceGroupConfig = new ReadwriteSplittingDataSourceGroupRuleConfiguration(
145145
"foo_group", "write_ds", Arrays.asList("read_ds0", "read_ds1"), "foo_algo");
146146
ReadwriteSplittingRuleConfiguration ruleConfig = new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceGroupConfig), Collections.emptyMap());
147-
RuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
147+
DatabaseRuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
148148
assertThat(checker.getRequiredDataSourceNames(ruleConfig), is(new LinkedHashSet<>(Arrays.asList("write_ds", "read_ds0", "read_ds1"))));
149149
}
150150

@@ -153,7 +153,7 @@ void assertGetRequiredDataSourceNamesWhenEmpty() {
153153
ReadwriteSplittingDataSourceGroupRuleConfiguration dataSourceGroupConfig = new ReadwriteSplittingDataSourceGroupRuleConfiguration(
154154
"foo_group", null, Collections.emptyList(), "foo_algo");
155155
ReadwriteSplittingRuleConfiguration ruleConfig = new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceGroupConfig), Collections.emptyMap());
156-
RuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
156+
DatabaseRuleConfigurationChecker checker = OrderedSPILoader.getServicesByClass(DatabaseRuleConfigurationChecker.class, Collections.singleton(ruleConfig.getClass())).get(ruleConfig.getClass());
157157
assertTrue(checker.getRequiredDataSourceNames(ruleConfig).isEmpty());
158158
}
159159
}

‎features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationEmptyCheckerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.readwritesplitting.checker;
1919

20-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
20+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2121
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
2222
import org.apache.shardingsphere.readwritesplitting.config.ReadwriteSplittingRuleConfiguration;
2323
import org.junit.jupiter.api.BeforeEach;

‎features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
2121
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
22-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
22+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
2323
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
2424
import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
2525
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -44,7 +44,7 @@
4444
/**
4545
* Shadow rule configuration checker.
4646
*/
47-
public final class ShadowRuleConfigurationChecker implements RuleConfigurationChecker<ShadowRuleConfiguration> {
47+
public final class ShadowRuleConfigurationChecker implements DatabaseRuleConfigurationChecker<ShadowRuleConfiguration> {
4848

4949
@Override
5050
public void check(final String databaseName, final ShadowRuleConfiguration ruleConfig, final Map<String, DataSource> dataSourceMap, final Collection<ShardingSphereRule> builtRules) {

‎features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationEmptyChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.shadow.checker;
1919

20-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
20+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2121
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
2222

2323
/**

‎features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker ‎features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker

File renamed without changes.

‎features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker ‎features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker

File renamed without changes.

‎features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationCheckerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
2121
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
22-
import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
22+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationChecker;
2323
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
2424
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
2525
import org.apache.shardingsphere.shadow.config.datasource.ShadowDataSourceConfiguration;
@@ -55,7 +55,7 @@ class ShadowRuleConfigurationCheckerTest {
5555
@BeforeEach
5656
void setUp() {
5757
ruleConfigChecker = (ShadowRuleConfigurationChecker) OrderedSPILoader.getServicesByClass(
58-
RuleConfigurationChecker.class, Collections.singleton(ShadowRuleConfiguration.class)).get(ShadowRuleConfiguration.class);
58+
DatabaseRuleConfigurationChecker.class, Collections.singleton(ShadowRuleConfiguration.class)).get(ShadowRuleConfiguration.class);
5959
}
6060

6161
@Test

‎features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationEmptyCheckerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.shadow.checker;
1919

20-
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
20+
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
2121
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
2222
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
2323
import org.apache.shardingsphere.shadow.config.datasource.ShadowDataSourceConfiguration;

0 commit comments

Comments
 (0)