You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/07/05 16:18:15 UTC
[shardingsphere] branch master updated: Rename RuleItemConfigurationChangedGenerator (#26783)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 5197d62a4bb Rename RuleItemConfigurationChangedGenerator (#26783)
5197d62a4bb is described below
commit 5197d62a4bbb4666b103e3557c3f4616b927d282
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jul 6 00:18:06 2023 +0800
Rename RuleItemConfigurationChangedGenerator (#26783)
* Refactor SingleTableSubscriber
* Refactor EncryptTableSubscriber
* Refactor EncryptTableSubscriber
* Refactor RuleItemChangedSubscribeEngine
* Refactor EncryptorSubscriber
* Refactor CompatibleEncryptorSubscriber and CompatibleEncryptTableSubscriber
* Refactor MaskAlgorithmSubscriber and MaskTableSubscriber
* Refactor ReadwriteSplittingLoadBalancerSubscriber
* Refactor ReadwriteSplittingDataSourceSubscriber
* Refactor BroadcastTableSubscriber
* Refactor DefaultStrategySubscribeEngine
* Refactor DefaultShardingAuditorStrategySubscriber
* Refactor DefaultShardingColumnSubscriber
* Refactor KeyGeneratorSubscriber
* Refactor ShardingAuditorSubscriber
* Refactor ShardingAutoTableSubscriber
* Refactor ShardingCacheSubscriber
* Refactor ShardingTableSubscriber
* Refactor ShardingTableReferenceSubscriber
* Refactor ShadowTableSubscriber
* Refactor ShadowDataSourceSubscriber
* Refactor ShadowAlgorithmSubscriber
* Refactor DefaultShadowAlgorithmNameSubscriber
* Refactor ReadwriteSplittingDataSourceSubscribeEngine
* Refactor RuleItemChangedSubscriber
* Rename RuleItemConfigurationChangedGenerator
* Rename RuleItemConfigurationChangedGenerator
---
...ne.java => BroadcastTableChangedGenerator.java} | 6 +++---
...ubsciber.RuleItemConfigurationChangedGenerator} | 2 +-
...gine.java => EncryptTableChangedGenerator.java} | 6 +++---
...eEngine.java => EncryptorChangedGenerator.java} | 6 +++---
...=> CompatibleEncryptTableChangedGenerator.java} | 6 +++---
...va => CompatibleEncryptorChangedGenerator.java} | 6 +++---
...ubsciber.RuleItemConfigurationChangedGenerator} | 8 ++++----
...ine.java => MaskAlgorithmChangedGenerator.java} | 6 +++---
...eEngine.java => MaskTableChangedGenerator.java} | 6 +++---
...ubsciber.RuleItemConfigurationChangedGenerator} | 4 ++--
...dwriteSplittingDataSourceChangedGenerator.java} | 8 ++++----
...riteSplittingLoadBalancerChangedGenerator.java} | 6 +++---
...ubsciber.RuleItemConfigurationChangedGenerator} | 4 ++--
...efaultShadowAlgorithmNameChangedGenerator.java} | 6 +++---
...e.java => ShadowAlgorithmChangedGenerator.java} | 6 +++---
....java => ShadowDataSourceChangedGenerator.java} | 6 +++---
...ngine.java => ShadowTableChangedGenerator.java} | 6 +++---
...ubsciber.RuleItemConfigurationChangedGenerator} | 8 ++++----
...tDatabaseShardingStrategyChangedGenerator.java} | 6 +++---
...efaultKeyGenerateStrategyChangedGenerator.java} | 6 +++---
...ltShardingAuditorStrategyChangedGenerator.java} | 6 +++---
... => DefaultShardingColumnChangedGenerator.java} | 6 +++---
...aultTableShardingStrategyChangedGenerator.java} | 6 +++---
...gine.java => KeyGeneratorChangedGenerator.java} | 6 +++---
...java => ShardingAlgorithmChangedGenerator.java} | 6 +++---
...e.java => ShardingAuditorChangedGenerator.java} | 6 +++---
...java => ShardingAutoTableChangedGenerator.java} | 6 +++---
...ine.java => ShardingCacheChangedGenerator.java} | 6 +++---
...ine.java => ShardingTableChangedGenerator.java} | 6 +++---
...=> ShardingTableReferenceChangedGenerator.java} | 6 +++---
...ubsciber.RuleItemConfigurationChangedGenerator} | 24 +++++++++++-----------
...ngine.java => SingleTableChangedGenerator.java} | 6 +++---
...ubsciber.RuleItemConfigurationChangedGenerator} | 2 +-
.../mode/subsciber/RuleItemChangedSubscriber.java | 24 +++++++++++++---------
... => RuleItemConfigurationChangedGenerator.java} | 6 ++++--
35 files changed, 123 insertions(+), 117 deletions(-)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastTableSubscribeEngine.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastTableChangedGenerator.java
similarity index 91%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastTableSubscribeEngine.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastTableChangedGenerator.java
index ef5228e3e58..0f65cc36f1b 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastTableSubscribeEngine.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastTableChangedGenerator.java
@@ -26,16 +26,16 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
/**
- * Broadcast table subscribe engine.
+ * Broadcast table changed generator.
*/
-public final class BroadcastTableSubscribeEngine implements RuleItemChangedSubscribeEngine<BroadcastRuleConfiguration, BroadcastRuleConfiguration> {
+public final class BroadcastTableChangedGenerator implements RuleItemConfigurationChangedGenerator<BroadcastRuleConfiguration, BroadcastRuleConfiguration> {
@Override
public BroadcastRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine b/features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
similarity index 90%
rename from features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
rename to features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
index 21c44314770..4b72fd48a72 100644
--- a/features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
+++ b/features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.broadcast.subscriber.BroadcastTableSubscribeEngine
+org.apache.shardingsphere.broadcast.subscriber.BroadcastTableChangedGenerator
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscribeEngine.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableChangedGenerator.java
similarity index 93%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscribeEngine.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableChangedGenerator.java
index a381605852c..f9a2ff980e4 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscribeEngine.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableChangedGenerator.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import java.util.Collection;
import java.util.Collections;
@@ -37,9 +37,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
/**
- * Encrypt table subscribe engine.
+ * Encrypt table changed generator.
*/
-public final class EncryptTableSubscribeEngine implements RuleItemChangedSubscribeEngine<EncryptRuleConfiguration, EncryptTableRuleConfiguration> {
+public final class EncryptTableChangedGenerator implements RuleItemConfigurationChangedGenerator<EncryptRuleConfiguration, EncryptTableRuleConfiguration> {
@Override
public EncryptTableRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscribeEngine.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorChangedGenerator.java
similarity index 93%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscribeEngine.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorChangedGenerator.java
index 485f91a6f69..a323dc6d546 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscribeEngine.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorChangedGenerator.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import java.util.Collection;
import java.util.Collections;
@@ -38,9 +38,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
/**
- * Encryptor subscribe engine.
+ * Encryptor changed generator.
*/
-public final class EncryptorSubscribeEngine implements RuleItemChangedSubscribeEngine<EncryptRuleConfiguration, AlgorithmConfiguration> {
+public final class EncryptorChangedGenerator implements RuleItemConfigurationChangedGenerator<EncryptRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscribeEngine.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableChangedGenerator.java
similarity index 93%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscribeEngine.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableChangedGenerator.java
index 1c59f2dd4db..900984fdd0d 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscribeEngine.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableChangedGenerator.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import java.util.Collection;
import java.util.Collections;
@@ -37,11 +37,11 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
/**
- * Compatible encrypt table subscribe engine.
+ * Compatible encrypt table changed generator.
* @deprecated compatible support will remove in next version.
*/
@Deprecated
-public final class CompatibleEncryptTableSubscribeEngine implements RuleItemChangedSubscribeEngine<CompatibleEncryptRuleConfiguration, EncryptTableRuleConfiguration> {
+public final class CompatibleEncryptTableChangedGenerator implements RuleItemConfigurationChangedGenerator<CompatibleEncryptRuleConfiguration, EncryptTableRuleConfiguration> {
@Override
public EncryptTableRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscribeEngine.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorChangedGenerator.java
similarity index 93%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscribeEngine.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorChangedGenerator.java
index 32fc4c7fa37..7f868be92bb 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscribeEngine.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorChangedGenerator.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import java.util.Collection;
import java.util.Collections;
@@ -38,11 +38,11 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
/**
- * Compatible encryptor subscribe engine.
+ * Compatible encryptor changed generator.
* @deprecated compatible support will remove in next version.
*/
@Deprecated
-public final class CompatibleEncryptorSubscribeEngine implements RuleItemChangedSubscribeEngine<CompatibleEncryptRuleConfiguration, AlgorithmConfiguration> {
+public final class CompatibleEncryptorChangedGenerator implements RuleItemConfigurationChangedGenerator<CompatibleEncryptRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine b/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
similarity index 81%
rename from features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
rename to features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
index f33c85f6a58..9c6e7265811 100644
--- a/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
+++ b/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.shardingsphere.encrypt.subscriber.EncryptTableSubscribeEngine
-org.apache.shardingsphere.encrypt.subscriber.EncryptorSubscribeEngine
-org.apache.shardingsphere.encrypt.subscriber.compatible.CompatibleEncryptTableSubscribeEngine
-org.apache.shardingsphere.encrypt.subscriber.compatible.CompatibleEncryptorSubscribeEngine
+org.apache.shardingsphere.encrypt.subscriber.EncryptTableChangedGenerator
+org.apache.shardingsphere.encrypt.subscriber.EncryptorChangedGenerator
+org.apache.shardingsphere.encrypt.subscriber.compatible.CompatibleEncryptTableChangedGenerator
+org.apache.shardingsphere.encrypt.subscriber.compatible.CompatibleEncryptorChangedGenerator
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscribeEngine.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmChangedGenerator.java
similarity index 93%
rename from features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscribeEngine.java
rename to features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmChangedGenerator.java
index c9751f5874d..3c0859492b1 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscribeEngine.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmChangedGenerator.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration;
import org.apache.shardingsphere.mask.event.algorithm.AlterMaskAlgorithmEvent;
import org.apache.shardingsphere.mask.event.algorithm.DropMaskAlgorithmEvent;
import org.apache.shardingsphere.mask.rule.MaskRule;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import java.util.Collection;
import java.util.Collections;
@@ -38,9 +38,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
/**
- * Mask algorithm subscribe engine.
+ * Mask algorithm changed generator.
*/
-public final class MaskAlgorithmSubscribeEngine implements RuleItemChangedSubscribeEngine<MaskRuleConfiguration, AlgorithmConfiguration> {
+public final class MaskAlgorithmChangedGenerator implements RuleItemConfigurationChangedGenerator<MaskRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscribeEngine.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableChangedGenerator.java
similarity index 93%
rename from features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscribeEngine.java
rename to features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableChangedGenerator.java
index 9575c682e6b..a2b224fd180 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscribeEngine.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableChangedGenerator.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.mask.event.table.DropMaskTableEvent;
import org.apache.shardingsphere.mask.rule.MaskRule;
import org.apache.shardingsphere.mask.yaml.config.rule.YamlMaskTableRuleConfiguration;
import org.apache.shardingsphere.mask.yaml.swapper.rule.YamlMaskTableRuleConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import java.util.Collection;
import java.util.Collections;
@@ -37,9 +37,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
/**
- * Mask table subscribe engine.
+ * Mask table changed generator.
*/
-public final class MaskTableSubscribeEngine implements RuleItemChangedSubscribeEngine<MaskRuleConfiguration, MaskTableRuleConfiguration> {
+public final class MaskTableChangedGenerator implements RuleItemConfigurationChangedGenerator<MaskRuleConfiguration, MaskTableRuleConfiguration> {
@Override
public MaskTableRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine b/features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
similarity index 84%
rename from features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
rename to features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
index f2126fc7ab7..1e666e059a8 100644
--- a/features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
+++ b/features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.mask.subscriber.MaskTableSubscribeEngine
-org.apache.shardingsphere.mask.subscriber.MaskAlgorithmSubscribeEngine
+org.apache.shardingsphere.mask.subscriber.MaskTableChangedGenerator
+org.apache.shardingsphere.mask.subscriber.MaskAlgorithmChangedGenerator
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceSubscribeEngine.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceChangedGenerator.java
similarity index 91%
rename from features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceSubscribeEngine.java
rename to features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceChangedGenerator.java
index 036e5835f99..befdd259655 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceSubscribeEngine.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceChangedGenerator.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
@@ -40,9 +40,9 @@ import java.util.LinkedList;
import java.util.Optional;
/**
- * Readwrite-splitting data source subscribe engine.
+ * Readwrite-splitting data source changed generator.
*/
-public final class ReadwriteSplittingDataSourceSubscribeEngine implements RuleItemChangedSubscribeEngine<ReadwriteSplittingRuleConfiguration, ReadwriteSplittingDataSourceRuleConfiguration> {
+public final class ReadwriteSplittingDataSourceChangedGenerator implements RuleItemConfigurationChangedGenerator<ReadwriteSplittingRuleConfiguration, ReadwriteSplittingDataSourceRuleConfiguration> {
@Override
public ReadwriteSplittingDataSourceRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
@@ -66,7 +66,7 @@ public final class ReadwriteSplittingDataSourceSubscribeEngine implements RuleIt
@Override
public void changeRuleItemConfiguration(final AlterRuleItemEvent event, final ReadwriteSplittingRuleConfiguration currentRuleConfig,
- final ReadwriteSplittingDataSourceRuleConfiguration toBeChangedItemConfig) {
+ final ReadwriteSplittingDataSourceRuleConfiguration toBeChangedItemConfig) {
// TODO refactor DistSQL to only persist config
currentRuleConfig.getDataSources().removeIf(each -> each.getName().equals(toBeChangedItemConfig.getName()));
currentRuleConfig.getDataSources().add(toBeChangedItemConfig);
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalancerSubscribeEngine.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalancerChangedGenerator.java
similarity index 92%
rename from features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalancerSubscribeEngine.java
rename to features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalancerChangedGenerator.java
index a4a9fb51b4f..131fd21ace0 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalancerSubscribeEngine.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalancerChangedGenerator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.event.loadbalance.AlterReadwriteSplittingLoadBalancerEvent;
import org.apache.shardingsphere.readwritesplitting.event.loadbalance.DropReadwriteSplittingLoadBalancerEvent;
@@ -38,9 +38,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
/**
- * Readwrite-splitting load-balancer subscribe engine.
+ * Readwrite-splitting load-balancer changed generator.
*/
-public final class ReadwriteSplittingLoadBalancerSubscribeEngine implements RuleItemChangedSubscribeEngine<ReadwriteSplittingRuleConfiguration, AlgorithmConfiguration> {
+public final class ReadwriteSplittingLoadBalancerChangedGenerator implements RuleItemConfigurationChangedGenerator<ReadwriteSplittingRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine b/features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
similarity index 92%
rename from features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
rename to features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
index 05c561c4898..60d9e1bf1b2 100644
--- a/features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
+++ b/features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.readwritesplitting.subscriber.ReadwriteSplittingDataSourceSubscribeEngine
-org.apache.shardingsphere.readwritesplitting.subscriber.ReadwriteSplittingLoadBalancerSubscribeEngine
+org.apache.shardingsphere.readwritesplitting.subscriber.ReadwriteSplittingDataSourceChangedGenerator
+org.apache.shardingsphere.readwritesplitting.subscriber.ReadwriteSplittingLoadBalancerChangedGenerator
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameSubscribeEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameChangedGenerator.java
similarity index 90%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameSubscribeEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameChangedGenerator.java
index b37a2ce1fa0..7a1b2f4cf24 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameSubscribeEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameChangedGenerator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.shadow.subscriber;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.event.algorithm.AlterDefaultShadowAlgorithmEvent;
import org.apache.shardingsphere.shadow.event.algorithm.DropDefaultShadowAlgorithmEvent;
@@ -30,9 +30,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Default shadow algorithm name subscribe engine.
+ * Default shadow algorithm name changed generator.
*/
-public final class DefaultShadowAlgorithmNameSubscribeEngine implements RuleItemChangedSubscribeEngine<ShadowRuleConfiguration, String> {
+public final class DefaultShadowAlgorithmNameChangedGenerator implements RuleItemConfigurationChangedGenerator<ShadowRuleConfiguration, String> {
@Override
public String swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmSubscribeEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmChangedGenerator.java
similarity index 92%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmSubscribeEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmChangedGenerator.java
index 3f8e8654299..82f8ce3065a 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmSubscribeEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmChangedGenerator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.event.algorithm.AlterShadowAlgorithmEvent;
import org.apache.shardingsphere.shadow.event.algorithm.DropShadowAlgorithmEvent;
@@ -36,9 +36,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Shadow algorithm subscribe engine.
+ * Shadow algorithm changed generator.
*/
-public final class ShadowAlgorithmSubscribeEngine implements RuleItemChangedSubscribeEngine<ShadowRuleConfiguration, AlgorithmConfiguration> {
+public final class ShadowAlgorithmChangedGenerator implements RuleItemConfigurationChangedGenerator<ShadowRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceSubscribeEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceChangedGenerator.java
similarity index 92%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceSubscribeEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceChangedGenerator.java
index 6b28a785494..6ff26967e4c 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceSubscribeEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceChangedGenerator.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
import org.apache.shardingsphere.shadow.event.datasource.AlterShadowDataSourceEvent;
@@ -35,9 +35,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Shadow data source subscribe engine.
+ * Shadow data source changed generator.
*/
-public final class ShadowDataSourceSubscribeEngine implements RuleItemChangedSubscribeEngine<ShadowRuleConfiguration, ShadowDataSourceConfiguration> {
+public final class ShadowDataSourceChangedGenerator implements RuleItemConfigurationChangedGenerator<ShadowRuleConfiguration, ShadowDataSourceConfiguration> {
@Override
public ShadowDataSourceConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableSubscribeEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableChangedGenerator.java
similarity index 92%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableSubscribeEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableChangedGenerator.java
index 7d121c9f320..72e9144088e 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableSubscribeEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableChangedGenerator.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
import org.apache.shardingsphere.shadow.event.table.AlterShadowTableEvent;
@@ -36,9 +36,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Shadow table subscribe engine.
+ * Shadow table changed generator.
*/
-public final class ShadowTableSubscribeEngine implements RuleItemChangedSubscribeEngine<ShadowRuleConfiguration, ShadowTableConfiguration> {
+public final class ShadowTableChangedGenerator implements RuleItemConfigurationChangedGenerator<ShadowRuleConfiguration, ShadowTableConfiguration> {
@Override
public ShadowTableConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine b/features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
similarity index 77%
rename from features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
rename to features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
index ce2acbb425f..4bf82db5bfb 100644
--- a/features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
+++ b/features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.shardingsphere.shadow.subscriber.ShadowDataSourceSubscribeEngine
-org.apache.shardingsphere.shadow.subscriber.ShadowTableSubscribeEngine
-org.apache.shardingsphere.shadow.subscriber.ShadowAlgorithmSubscribeEngine
-org.apache.shardingsphere.shadow.subscriber.DefaultShadowAlgorithmNameSubscribeEngine
+org.apache.shardingsphere.shadow.subscriber.ShadowDataSourceChangedGenerator
+org.apache.shardingsphere.shadow.subscriber.ShadowTableChangedGenerator
+org.apache.shardingsphere.shadow.subscriber.ShadowAlgorithmChangedGenerator
+org.apache.shardingsphere.shadow.subscriber.DefaultShadowAlgorithmNameChangedGenerator
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultDatabaseShardingStrategySubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultDatabaseShardingStrategyChangedGenerator.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultDatabaseShardingStrategySubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultDatabaseShardingStrategyChangedGenerator.java
index 86cf8c5b9f3..be4ef40b346 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultDatabaseShardingStrategySubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultDatabaseShardingStrategyChangedGenerator.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration;
import org.apache.shardingsphere.sharding.event.strategy.database.AlterDefaultDatabaseShardingStrategyEvent;
@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Default database sharding strategy subscribe engine.
+ * Default database sharding strategy changed generator.
*/
-public final class DefaultDatabaseShardingStrategySubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, ShardingStrategyConfiguration> {
+public final class DefaultDatabaseShardingStrategyChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, ShardingStrategyConfiguration> {
@Override
public ShardingStrategyConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultKeyGenerateStrategySubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultKeyGenerateStrategyChangedGenerator.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultKeyGenerateStrategySubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultKeyGenerateStrategyChangedGenerator.java
index 5fef5bbc322..4a21148e77a 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultKeyGenerateStrategySubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultKeyGenerateStrategyChangedGenerator.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
import org.apache.shardingsphere.sharding.event.strategy.keygenerate.AlterDefaultKeyGenerateStrategyEvent;
@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Default key generate strategy subscribe engine.
+ * Default key generate strategy changed generator.
*/
-public final class DefaultKeyGenerateStrategySubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, KeyGenerateStrategyConfiguration> {
+public final class DefaultKeyGenerateStrategyChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, KeyGenerateStrategyConfiguration> {
@Override
public KeyGenerateStrategyConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingAuditorStrategySubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingAuditorStrategyChangedGenerator.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingAuditorStrategySubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingAuditorStrategyChangedGenerator.java
index e26d3d69886..dc443438ff1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingAuditorStrategySubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingAuditorStrategyChangedGenerator.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration;
import org.apache.shardingsphere.sharding.event.strategy.audit.AlterDefaultShardingAuditorStrategyEvent;
@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Default sharding auditor strategy subscribe engine.
+ * Default sharding auditor strategy changed generator.
*/
-public final class DefaultShardingAuditorStrategySubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, ShardingAuditStrategyConfiguration> {
+public final class DefaultShardingAuditorStrategyChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, ShardingAuditStrategyConfiguration> {
@Override
public ShardingAuditStrategyConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingColumnSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingColumnChangedGenerator.java
similarity index 90%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingColumnSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingColumnChangedGenerator.java
index 6b1a6623c41..0037b667ad1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingColumnSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultShardingColumnChangedGenerator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.subscriber;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.AlterDefaultShardingColumnEvent;
import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.DropDefaultShardingColumnEvent;
@@ -30,9 +30,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Default sharding column subscribe engine.
+ * Default sharding column changed generator.
*/
-public final class DefaultShardingColumnSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, String> {
+public final class DefaultShardingColumnChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, String> {
@Override
public String swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultTableShardingStrategySubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultTableShardingStrategyChangedGenerator.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultTableShardingStrategySubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultTableShardingStrategyChangedGenerator.java
index c3688175abc..0db5248d5b1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultTableShardingStrategySubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/DefaultTableShardingStrategyChangedGenerator.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration;
import org.apache.shardingsphere.sharding.event.strategy.table.AlterDefaultTableShardingStrategyEvent;
@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Default table sharding strategy subscribe engine.
+ * Default table sharding strategy changed generator.
*/
-public final class DefaultTableShardingStrategySubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, ShardingStrategyConfiguration> {
+public final class DefaultTableShardingStrategyChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, ShardingStrategyConfiguration> {
@Override
public ShardingStrategyConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/KeyGeneratorSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/KeyGeneratorChangedGenerator.java
similarity index 92%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/KeyGeneratorSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/KeyGeneratorChangedGenerator.java
index 4c1ca25027d..55472e13140 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/KeyGeneratorSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/KeyGeneratorChangedGenerator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.AlterKeyGeneratorEvent;
import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.DropKeyGeneratorEvent;
@@ -36,9 +36,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Key generator subscribe engine.
+ * Key generator changed generator.
*/
-public final class KeyGeneratorSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, AlgorithmConfiguration> {
+public final class KeyGeneratorChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmChangedGenerator.java
similarity index 92%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmChangedGenerator.java
index 45a1ccbb799..4474de3dbd0 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmChangedGenerator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.event.algorithm.sharding.AlterShardingAlgorithmEvent;
import org.apache.shardingsphere.sharding.event.algorithm.sharding.DropShardingAlgorithmEvent;
@@ -36,9 +36,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Sharding algorithm subscribe engine.
+ * Sharding algorithm changed generator.
*/
-public final class ShardingAlgorithmSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, AlgorithmConfiguration> {
+public final class ShardingAlgorithmChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAuditorSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAuditorChangedGenerator.java
similarity index 92%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAuditorSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAuditorChangedGenerator.java
index 8a2c43f580b..fb26b30282f 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAuditorSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAuditorChangedGenerator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.event.algorithm.auditor.AlterShardingAuditorEvent;
import org.apache.shardingsphere.sharding.event.algorithm.auditor.DropShardingAuditorEvent;
@@ -36,9 +36,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Sharding auditor subscribe engine.
+ * Sharding auditor changed generator.
*/
-public final class ShardingAuditorSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, AlgorithmConfiguration> {
+public final class ShardingAuditorChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, AlgorithmConfiguration> {
@Override
public AlgorithmConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAutoTableSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAutoTableChangedGenerator.java
similarity index 92%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAutoTableSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAutoTableChangedGenerator.java
index 30ce34f8cba..d5fec5b2068 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAutoTableSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAutoTableChangedGenerator.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.event.table.auto.AlterShardingAutoTableEvent;
@@ -36,9 +36,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Sharding auto table subscribe engine.
+ * Sharding auto table changed generator.
*/
-public final class ShardingAutoTableSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, ShardingAutoTableRuleConfiguration> {
+public final class ShardingAutoTableChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, ShardingAutoTableRuleConfiguration> {
@Override
public ShardingAutoTableRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheChangedGenerator.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheChangedGenerator.java
index d2cb45240ac..88dfdb0a6e0 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheChangedGenerator.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.cache.ShardingCacheConfiguration;
import org.apache.shardingsphere.sharding.event.cache.AlterShardingCacheEvent;
@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Sharding cache subscribe engine.
+ * Sharding cache changed generator.
*/
-public final class ShardingCacheSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, ShardingCacheConfiguration> {
+public final class ShardingCacheChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, ShardingCacheConfiguration> {
@Override
public ShardingCacheConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableChangedGenerator.java
similarity index 92%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableChangedGenerator.java
index 443edd2cfef..24c26354951 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableChangedGenerator.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.event.table.sharding.AlterShardingTableEvent;
@@ -36,9 +36,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Sharding table subscribe engine.
+ * Sharding table changed generator.
*/
-public final class ShardingTableSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, ShardingTableRuleConfiguration> {
+public final class ShardingTableChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, ShardingTableRuleConfiguration> {
@Override
public ShardingTableRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableReferenceSubscribeEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableReferenceChangedGenerator.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableReferenceSubscribeEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableReferenceChangedGenerator.java
index 6e0d1ef7f23..184ad92f8da 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableReferenceSubscribeEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableReferenceChangedGenerator.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterNamedRuleItemE
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
import org.apache.shardingsphere.sharding.event.table.binding.AlterShardingTableReferenceEvent;
@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Sharding table reference subscribe engine.
+ * Sharding table reference changed generator.
*/
-public final class ShardingTableReferenceSubscribeEngine implements RuleItemChangedSubscribeEngine<ShardingRuleConfiguration, ShardingTableReferenceRuleConfiguration> {
+public final class ShardingTableReferenceChangedGenerator implements RuleItemConfigurationChangedGenerator<ShardingRuleConfiguration, ShardingTableReferenceRuleConfiguration> {
@Override
public ShardingTableReferenceRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine b/features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
similarity index 65%
rename from features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
rename to features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
index 997faf70e4f..b5aef1b64f4 100644
--- a/features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
+++ b/features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
@@ -15,15 +15,15 @@
# limitations under the License.
#
-org.apache.shardingsphere.sharding.subscriber.ShardingTableSubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.ShardingAutoTableSubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.ShardingTableReferenceSubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.ShardingAlgorithmSubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.KeyGeneratorSubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.ShardingAuditorSubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.DefaultDatabaseShardingStrategySubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.DefaultTableShardingStrategySubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.DefaultKeyGenerateStrategySubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.DefaultShardingAuditorStrategySubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.DefaultShardingColumnSubscribeEngine
-org.apache.shardingsphere.sharding.subscriber.ShardingCacheSubscribeEngine
+org.apache.shardingsphere.sharding.subscriber.ShardingTableChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.ShardingAutoTableChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.ShardingTableReferenceChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.ShardingAlgorithmChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.KeyGeneratorChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.ShardingAuditorChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.DefaultDatabaseShardingStrategyChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.DefaultTableShardingStrategyChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.DefaultKeyGenerateStrategyChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.DefaultShardingAuditorStrategyChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.DefaultShardingColumnChangedGenerator
+org.apache.shardingsphere.sharding.subscriber.ShardingCacheChangedGenerator
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleTableSubscribeEngine.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleTableChangedGenerator.java
similarity index 92%
rename from kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleTableSubscribeEngine.java
rename to kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleTableChangedGenerator.java
index 7c1150a5c90..8b8af1a0f59 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleTableSubscribeEngine.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleTableChangedGenerator.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine;
+import org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator;
import org.apache.shardingsphere.single.api.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.event.config.AlterSingleTableEvent;
import org.apache.shardingsphere.single.event.config.DropSingleTableEvent;
@@ -33,9 +33,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Single table subscribe engine.
+ * Single table changed generator.
*/
-public final class SingleTableSubscribeEngine implements RuleItemChangedSubscribeEngine<SingleRuleConfiguration, SingleRuleConfiguration> {
+public final class SingleTableChangedGenerator implements RuleItemConfigurationChangedGenerator<SingleRuleConfiguration, SingleRuleConfiguration> {
@Override
public SingleRuleConfiguration swapRuleItemConfigurationFromEvent(final AlterRuleItemEvent event, final String yamlContent) {
diff --git a/kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine b/kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
similarity index 91%
rename from kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
rename to kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
index e27a28c84f4..39cc2678862 100644
--- a/kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemChangedSubscribeEngine
+++ b/kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleItemConfigurationChangedGenerator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.single.subscriber.SingleTableSubscribeEngine
+org.apache.shardingsphere.single.subscriber.SingleTableChangedGenerator
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java
index 69c6f4e8b89..e8fdeacc773 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java
@@ -42,16 +42,18 @@ public final class RuleItemChangedSubscriber {
*/
@SuppressWarnings({"UnstableApiUsage", "rawtypes", "unchecked"})
@Subscribe
- public synchronized void renew(final AlterRuleItemEvent event) {
- RuleItemChangedSubscribeEngine engine = TypedSPILoader.getService(RuleItemChangedSubscribeEngine.class, event.getClass().getName());
+ public void renew(final AlterRuleItemEvent event) {
+ RuleItemConfigurationChangedGenerator generator = TypedSPILoader.getService(RuleItemConfigurationChangedGenerator.class, event.getClass().getName());
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
String yamlContent = contextManager.getInstanceContext().getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion());
ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
- RuleConfiguration currentRuleConfig = engine.findRuleConfiguration(database);
- engine.changeRuleItemConfiguration(event, currentRuleConfig, engine.swapRuleItemConfigurationFromEvent(event, yamlContent));
- contextManager.getInstanceContext().getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), currentRuleConfig));
+ RuleConfiguration currentRuleConfig = generator.findRuleConfiguration(database);
+ synchronized (this) {
+ generator.changeRuleItemConfiguration(event, currentRuleConfig, generator.swapRuleItemConfigurationFromEvent(event, yamlContent));
+ contextManager.getInstanceContext().getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), currentRuleConfig));
+ }
}
/**
@@ -61,14 +63,16 @@ public final class RuleItemChangedSubscriber {
*/
@SuppressWarnings({"UnstableApiUsage", "rawtypes", "unchecked"})
@Subscribe
- public synchronized void renew(final DropRuleItemEvent event) {
- RuleItemChangedSubscribeEngine engine = TypedSPILoader.getService(RuleItemChangedSubscribeEngine.class, event.getClass().getName());
+ public void renew(final DropRuleItemEvent event) {
+ RuleItemConfigurationChangedGenerator generator = TypedSPILoader.getService(RuleItemConfigurationChangedGenerator.class, event.getClass().getName());
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
- RuleConfiguration currentRuleConfig = engine.findRuleConfiguration(database);
- engine.dropRuleItemConfiguration(event, currentRuleConfig);
- contextManager.getInstanceContext().getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), currentRuleConfig));
+ RuleConfiguration currentRuleConfig = generator.findRuleConfiguration(database);
+ synchronized (this) {
+ generator.dropRuleItemConfiguration(event, currentRuleConfig);
+ contextManager.getInstanceContext().getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), currentRuleConfig));
+ }
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscribeEngine.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemConfigurationChangedGenerator.java
similarity index 90%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscribeEngine.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemConfigurationChangedGenerator.java
index 0787a794111..1fc9668e8a5 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscribeEngine.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemConfigurationChangedGenerator.java
@@ -21,15 +21,17 @@ import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.event.rule.alter.AlterRuleItemEvent;
import org.apache.shardingsphere.infra.rule.event.rule.drop.DropRuleItemEvent;
+import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
/**
- * Rule item changed subscribe engine.
+ * Rule item configuration changed generator.
*
* @param <T> type of rule configuration
* @param <I> type of rule item configuration
*/
-public interface RuleItemChangedSubscribeEngine<T extends RuleConfiguration, I> extends TypedSPI {
+@SingletonSPI
+public interface RuleItemConfigurationChangedGenerator<T extends RuleConfiguration, I> extends TypedSPI {
/**
* Swap rule item configuration from event.