Skip to content

Commit f61a192

Browse files
terrymanuterrymanu
authored
Rename DatabaseRuleNodeProvider (#34775)
1 parent a802847 commit f61a192

File tree

52 files changed

+152
-152
lines changed

Some content is hidden

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

52 files changed

+152
-152
lines changed

features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProvider.java renamed to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodeProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
2121
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
2222
import org.apache.shardingsphere.mode.node.path.type.config.database.DatabaseRuleNode;
23-
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodePathProvider;
23+
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodeProvider;
2424

2525
import java.util.Collections;
2626

2727
/**
2828
* Broadcast rule node path provider.
2929
*/
30-
public final class BroadcastRuleNodePathProvider implements DatabaseRuleNodePathProvider {
30+
public final class BroadcastRuleNodeProvider implements DatabaseRuleNodeProvider {
3131

3232
public static final String RULE_TYPE = "broadcast";
3333

@@ -36,7 +36,7 @@ public final class BroadcastRuleNodePathProvider implements DatabaseRuleNodePath
3636
private static final DatabaseRuleNode INSTANCE = new DatabaseRuleNode(RULE_TYPE, Collections.emptyList(), Collections.singleton(TABLES));
3737

3838
@Override
39-
public DatabaseRuleNode getDatabaseRuleNodePath() {
39+
public DatabaseRuleNode getDatabaseRuleNode() {
4040
return INSTANCE;
4141
}
4242

‎features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastTableChangedProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.broadcast.rule.changed;
1919

2020
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
21-
import org.apache.shardingsphere.broadcast.metadata.nodepath.BroadcastRuleNodePathProvider;
21+
import org.apache.shardingsphere.broadcast.metadata.nodepath.BroadcastRuleNodeProvider;
2222
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
2323
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
2424
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
@@ -58,6 +58,6 @@ public void dropRuleItemConfiguration(final DropRuleItem dropRuleItem, final Bro
5858

5959
@Override
6060
public String getType() {
61-
return BroadcastRuleNodePathProvider.RULE_TYPE + "." + BroadcastRuleNodePathProvider.TABLES;
61+
return BroadcastRuleNodeProvider.RULE_TYPE + "." + BroadcastRuleNodeProvider.TABLES;
6262
}
6363
}

features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodePathProvider renamed to features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodeProvider

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# limitations under the License.
1616
#
1717

18-
org.apache.shardingsphere.broadcast.metadata.nodepath.BroadcastRuleNodePathProvider
18+
org.apache.shardingsphere.broadcast.metadata.nodepath.BroadcastRuleNodeProvider

‎features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/metadata/nodepath/BroadcastRuleNodePathProviderTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
2121
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
2222
import org.apache.shardingsphere.mode.node.path.type.config.database.DatabaseRuleNode;
23-
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodePathProvider;
23+
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodeProvider;
2424
import org.junit.jupiter.api.Test;
2525

2626
import static org.hamcrest.CoreMatchers.is;
@@ -29,14 +29,14 @@
2929

3030
class BroadcastRuleNodePathProviderTest {
3131

32-
private final DatabaseRuleNodePathProvider pathProvider = TypedSPILoader.getService(DatabaseRuleNodePathProvider.class, BroadcastRuleConfiguration.class);
32+
private final DatabaseRuleNodeProvider pathProvider = TypedSPILoader.getService(DatabaseRuleNodeProvider.class, BroadcastRuleConfiguration.class);
3333

3434
@Test
35-
void assertGetDatabaseRuleNodePath() {
36-
DatabaseRuleNode actual = pathProvider.getDatabaseRuleNodePath();
35+
void assertGetDatabaseRuleNode() {
36+
DatabaseRuleNode actual = pathProvider.getDatabaseRuleNode();
3737
assertTrue(actual.getNamedItems().isEmpty());
3838
assertThat(actual.getUniqueItems().size(), is(1));
39-
assertTrue(actual.getUniqueItems().containsKey(BroadcastRuleNodePathProvider.TABLES));
40-
assertThat(actual.getRuleType(), is(BroadcastRuleNodePathProvider.RULE_TYPE));
39+
assertTrue(actual.getUniqueItems().containsKey(BroadcastRuleNodeProvider.TABLES));
40+
assertThat(actual.getRuleType(), is(BroadcastRuleNodeProvider.RULE_TYPE));
4141
}
4242
}

features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProvider.java renamed to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodeProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
2121
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
2222
import org.apache.shardingsphere.mode.node.path.type.config.database.DatabaseRuleNode;
23-
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodePathProvider;
23+
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodeProvider;
2424

2525
import java.util.Arrays;
2626
import java.util.Collections;
2727

2828
/**
2929
* Encrypt rule node path provider.
3030
*/
31-
public final class EncryptRuleNodePathProvider implements DatabaseRuleNodePathProvider {
31+
public final class EncryptRuleNodeProvider implements DatabaseRuleNodeProvider {
3232

3333
public static final String RULE_TYPE = "encrypt";
3434

@@ -39,7 +39,7 @@ public final class EncryptRuleNodePathProvider implements DatabaseRuleNodePathPr
3939
private static final DatabaseRuleNode INSTANCE = new DatabaseRuleNode(RULE_TYPE, Arrays.asList(TABLES, ENCRYPTORS), Collections.emptyList());
4040

4141
@Override
42-
public DatabaseRuleNode getDatabaseRuleNodePath() {
42+
public DatabaseRuleNode getDatabaseRuleNode() {
4343
return INSTANCE;
4444
}
4545

‎features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/changed/EncryptTableChangedProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
2121
import org.apache.shardingsphere.encrypt.config.rule.EncryptTableRuleConfiguration;
22-
import org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodePathProvider;
22+
import org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodeProvider;
2323
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
2424
import org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleConfiguration;
2525
import org.apache.shardingsphere.encrypt.yaml.swapper.rule.YamlEncryptTableRuleConfigurationSwapper;
@@ -63,6 +63,6 @@ public void dropRuleItemConfiguration(final DropRuleItem dropRuleItem, final Enc
6363

6464
@Override
6565
public String getType() {
66-
return EncryptRuleNodePathProvider.RULE_TYPE + "." + EncryptRuleNodePathProvider.TABLES;
66+
return EncryptRuleNodeProvider.RULE_TYPE + "." + EncryptRuleNodeProvider.TABLES;
6767
}
6868
}

‎features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/changed/EncryptorChangedProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.encrypt.rule.changed;
1919

2020
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
21-
import org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodePathProvider;
21+
import org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodeProvider;
2222
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
2323
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
2424
import org.apache.shardingsphere.infra.algorithm.core.processor.AlgorithmChangedProcessor;
@@ -48,6 +48,6 @@ protected Map<String, AlgorithmConfiguration> getAlgorithmConfigurations(final E
4848

4949
@Override
5050
public String getType() {
51-
return EncryptRuleNodePathProvider.RULE_TYPE + "." + EncryptRuleNodePathProvider.ENCRYPTORS;
51+
return EncryptRuleNodeProvider.RULE_TYPE + "." + EncryptRuleNodeProvider.ENCRYPTORS;
5252
}
5353
}

features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodePathProvider renamed to features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodeProvider

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# limitations under the License.
1616
#
1717

18-
org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodePathProvider
18+
org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodeProvider

‎features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/nodepath/EncryptRuleNodePathProviderTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
2121
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
2222
import org.apache.shardingsphere.mode.node.path.type.config.database.DatabaseRuleNode;
23-
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodePathProvider;
23+
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodeProvider;
2424
import org.junit.jupiter.api.Test;
2525

2626
import static org.hamcrest.CoreMatchers.is;
@@ -29,15 +29,15 @@
2929

3030
class EncryptRuleNodePathProviderTest {
3131

32-
private final DatabaseRuleNodePathProvider pathProvider = TypedSPILoader.getService(DatabaseRuleNodePathProvider.class, EncryptRuleConfiguration.class);
32+
private final DatabaseRuleNodeProvider pathProvider = TypedSPILoader.getService(DatabaseRuleNodeProvider.class, EncryptRuleConfiguration.class);
3333

3434
@Test
35-
void assertGetDatabaseRuleNodePath() {
36-
DatabaseRuleNode actual = pathProvider.getDatabaseRuleNodePath();
35+
void assertGetDatabaseRuleNode() {
36+
DatabaseRuleNode actual = pathProvider.getDatabaseRuleNode();
3737
assertThat(actual.getNamedItems().size(), is(2));
38-
assertTrue(actual.getNamedItems().containsKey(EncryptRuleNodePathProvider.ENCRYPTORS));
39-
assertTrue(actual.getNamedItems().containsKey(EncryptRuleNodePathProvider.TABLES));
38+
assertTrue(actual.getNamedItems().containsKey(EncryptRuleNodeProvider.ENCRYPTORS));
39+
assertTrue(actual.getNamedItems().containsKey(EncryptRuleNodeProvider.TABLES));
4040
assertTrue(actual.getUniqueItems().isEmpty());
41-
assertThat(actual.getRuleType(), is(EncryptRuleNodePathProvider.RULE_TYPE));
41+
assertThat(actual.getRuleType(), is(EncryptRuleNodeProvider.RULE_TYPE));
4242
}
4343
}

features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodePathProvider.java renamed to features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/nodepath/MaskRuleNodeProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
2121
import org.apache.shardingsphere.mask.config.MaskRuleConfiguration;
2222
import org.apache.shardingsphere.mode.node.path.type.config.database.DatabaseRuleNode;
23-
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodePathProvider;
23+
import org.apache.shardingsphere.mode.node.spi.DatabaseRuleNodeProvider;
2424

2525
import java.util.Arrays;
2626
import java.util.Collections;
2727

2828
/**
2929
* Mask rule node path provider.
3030
*/
31-
public final class MaskRuleNodePathProvider implements DatabaseRuleNodePathProvider {
31+
public final class MaskRuleNodeProvider implements DatabaseRuleNodeProvider {
3232

3333
public static final String RULE_TYPE = "mask";
3434

@@ -39,7 +39,7 @@ public final class MaskRuleNodePathProvider implements DatabaseRuleNodePathProvi
3939
private static final DatabaseRuleNode INSTANCE = new DatabaseRuleNode(RULE_TYPE, Arrays.asList(TABLES, MASK_ALGORITHMS), Collections.emptyList());
4040

4141
@Override
42-
public DatabaseRuleNode getDatabaseRuleNodePath() {
42+
public DatabaseRuleNode getDatabaseRuleNode() {
4343
return INSTANCE;
4444
}
4545

0 commit comments

Comments
 (0)