You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/06/29 12:03:42 UTC
[shardingsphere] branch master updated: Unify names of rule item changed event (#26690)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 9f4f29c2b7f Unify names of rule item changed event (#26690)
9f4f29c2b7f is described below
commit 9f4f29c2b7fceb7515548b295ce99ac18aebcf78
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 29 20:03:35 2023 +0800
Unify names of rule item changed event (#26690)
---
.../event/BroadcastRuleChangedEventCreator.java | 2 +-
.../{config => table}/AddBroadcastTableEvent.java | 2 +-
.../AlterBroadcastTableEvent.java | 2 +-
.../DeleteBroadcastTableEvent.java | 2 +-
.../creator}/BroadcastTableEventCreator.java | 5 ++-
.../BroadcastConfigurationSubscriber.java | 6 ++--
.../CompatibleEncryptRuleChangedEventCreator.java | 4 +--
.../event/EncryptRuleChangedEventCreator.java | 4 +--
.../CompatibleEncryptorEventCreator.java | 6 +++-
.../CompatibleEncryptTableEventCreator.java | 7 +++-
.../{ => creator}/EncryptorEventCreator.java | 4 ++-
.../{ => creator}/EncryptTableEventCreator.java | 5 ++-
.../mask/event/MaskRuleChangedEventCreator.java | 4 +--
.../algorithm/{ => creator}/MaskEventCreator.java | 4 ++-
.../table/{ => creator}/MaskTableCreator.java | 5 ++-
.../ReadwriteSplittingRuleChangedEventCreator.java | 4 +--
.../ReadwriteSplittingDataSourceEventCreator.java | 5 ++-
... AlterReadwriteSplittingLoadBalancerEvent.java} | 4 +--
...DeleteReadwriteSplittingLoadBalancerEvent.java} | 4 +--
...ReadwriteSplittingLoadBalancerEventCreator.java | 8 +++--
.../ReadwriteSplittingLoadBalanceSubscriber.java | 8 ++---
.../event/ShadowRuleChangedEventCreator.java | 8 ++---
.../DefaultShadowAlgorithmEventCreator.java | 4 ++-
.../{ => creator}/ShadowAlgorithmEventCreator.java | 4 ++-
.../ShadowDataSourceEventCreator.java | 5 ++-
.../{ => creator}/ShadowTableEventCreator.java | 5 ++-
.../event/ShardingRuleChangedEventCreator.java | 32 ++++++++---------
...orEvent.java => AlterShardingAuditorEvent.java} | 4 +--
...rEvent.java => DeleteShardingAuditorEvent.java} | 4 +--
.../AuditShardingEventCreator.java} | 12 ++++---
.../{ => creator}/KeyGeneratorEventCreator.java | 4 ++-
.../ShardingAlgorithmEventCreator.java | 4 ++-
...rationEvent.java => AddShardingCacheEvent.java} | 4 +--
...tionEvent.java => AlterShardingCacheEvent.java} | 4 +--
...ionEvent.java => DeleteShardingCacheEvent.java} | 4 +--
.../{ => creator}/ShardingCacheEventCreator.java | 11 +++---
.../ShardingAuditorStrategyEventCreator.java | 5 ++-
...> AddDefaultDatabaseShardingStrategyEvent.java} | 4 +--
...AlterDefaultDatabaseShardingStrategyEvent.java} | 4 +--
...eleteDefaultDatabaseShardingStrategyEvent.java} | 4 +--
...faultDatabaseShardingStrategyEventCreator.java} | 15 ++++----
...ava => AddDefaultKeyGenerateStrategyEvent.java} | 4 +--
...a => AlterDefaultKeyGenerateStrategyEvent.java} | 4 +--
... => DeleteDefaultKeyGenerateStrategyEvent.java} | 4 +--
.../DefaultKeyGenerateStrategyEventCreator.java} | 15 ++++----
.../DefaultShardingColumnEventCreator.java | 5 ++-
...a => AddDefaultTableShardingStrategyEvent.java} | 4 +--
...=> AlterDefaultTableShardingStrategyEvent.java} | 4 +--
...> DeleteDefaultTableShardingStrategyEvent.java} | 4 +--
.../table/TableShardingStrategyEventCreator.java | 40 ----------------------
.../DefaultTableShardingStrategyEventCreator.java} | 15 ++++----
...onEvent.java => AddShardingAutoTableEvent.java} | 4 +--
...Event.java => AlterShardingAutoTableEvent.java} | 4 +--
...vent.java => DeleteShardingAutoTableEvent.java} | 4 +--
.../ShardingAutoTableEventCreator.java | 11 +++---
...nt.java => AddShardingTableReferenceEvent.java} | 4 +--
....java => AlterShardingTableReferenceEvent.java} | 4 +--
...java => DeleteShardingTableReferenceEvent.java} | 4 +--
.../ShardingTableReferenceEventCreator.java | 11 +++---
...rationEvent.java => AddShardingTableEvent.java} | 4 +--
...tionEvent.java => AlterShardingTableEvent.java} | 4 +--
...ionEvent.java => DeleteShardingTableEvent.java} | 4 +--
.../{ => creator}/ShardingTableEventCreator.java | 11 +++---
.../subscriber/ShardingAlgorithmSubscriber.java | 8 ++---
.../ShardingCacheConfigurationSubscriber.java | 12 +++----
.../ShardingStrategyConfigurationSubscriber.java | 36 +++++++++----------
.../ShardingTableConfigurationSubscriber.java | 36 +++++++++----------
.../queryable/ExportStorageNodesExecutorTest.java | 3 +-
68 files changed, 264 insertions(+), 235 deletions(-)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/BroadcastRuleChangedEventCreator.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/BroadcastRuleChangedEventCreator.java
index c40e16777af..a9a48a48958 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/BroadcastRuleChangedEventCreator.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/BroadcastRuleChangedEventCreator.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.broadcast.event;
-import org.apache.shardingsphere.broadcast.event.config.BroadcastTableEventCreator;
+import org.apache.shardingsphere.broadcast.event.table.creator.BroadcastTableEventCreator;
import org.apache.shardingsphere.broadcast.metadata.nodepath.BroadcastRuleNodePathProvider;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/AddBroadcastTableEvent.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/AddBroadcastTableEvent.java
similarity index 95%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/AddBroadcastTableEvent.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/AddBroadcastTableEvent.java
index 2dd79d7bb9d..2a695d57fbb 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/AddBroadcastTableEvent.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/AddBroadcastTableEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.broadcast.event.config;
+package org.apache.shardingsphere.broadcast.event.table;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/AlterBroadcastTableEvent.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/AlterBroadcastTableEvent.java
similarity index 95%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/AlterBroadcastTableEvent.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/AlterBroadcastTableEvent.java
index 3dfec080494..2649f529105 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/AlterBroadcastTableEvent.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/AlterBroadcastTableEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.broadcast.event.config;
+package org.apache.shardingsphere.broadcast.event.table;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/DeleteBroadcastTableEvent.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/DeleteBroadcastTableEvent.java
similarity index 95%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/DeleteBroadcastTableEvent.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/DeleteBroadcastTableEvent.java
index bd624005d20..aaa6308bae3 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/DeleteBroadcastTableEvent.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/DeleteBroadcastTableEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.broadcast.event.config;
+package org.apache.shardingsphere.broadcast.event.table;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/BroadcastTableEventCreator.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/creator/BroadcastTableEventCreator.java
similarity index 84%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/BroadcastTableEventCreator.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/creator/BroadcastTableEventCreator.java
index ff4e7492f27..4e752fcd634 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/config/BroadcastTableEventCreator.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/event/table/creator/BroadcastTableEventCreator.java
@@ -15,8 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.broadcast.event.config;
+package org.apache.shardingsphere.broadcast.event.table.creator;
+import org.apache.shardingsphere.broadcast.event.table.AddBroadcastTableEvent;
+import org.apache.shardingsphere.broadcast.event.table.AlterBroadcastTableEvent;
+import org.apache.shardingsphere.broadcast.event.table.DeleteBroadcastTableEvent;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java
index 82474b39461..59c379b4c71 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.broadcast.subscriber;
import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration;
-import org.apache.shardingsphere.broadcast.event.config.AddBroadcastTableEvent;
-import org.apache.shardingsphere.broadcast.event.config.AlterBroadcastTableEvent;
-import org.apache.shardingsphere.broadcast.event.config.DeleteBroadcastTableEvent;
+import org.apache.shardingsphere.broadcast.event.table.AddBroadcastTableEvent;
+import org.apache.shardingsphere.broadcast.event.table.AlterBroadcastTableEvent;
+import org.apache.shardingsphere.broadcast.event.table.DeleteBroadcastTableEvent;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
import org.apache.shardingsphere.broadcast.yaml.config.YamlBroadcastRuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/CompatibleEncryptRuleChangedEventCreator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/CompatibleEncryptRuleChangedEventCreator.java
index 8ad9239fc2f..03934d78d85 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/CompatibleEncryptRuleChangedEventCreator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/CompatibleEncryptRuleChangedEventCreator.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.encrypt.event;
-import org.apache.shardingsphere.encrypt.event.compatible.encryptor.CompatibleEncryptorEventCreator;
-import org.apache.shardingsphere.encrypt.event.compatible.table.CompatibleEncryptTableEventCreator;
+import org.apache.shardingsphere.encrypt.event.compatible.encryptor.creator.CompatibleEncryptorEventCreator;
+import org.apache.shardingsphere.encrypt.event.compatible.table.creator.CompatibleEncryptTableEventCreator;
import org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodePathProvider;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleChangedEventCreator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleChangedEventCreator.java
index d1d19759517..c6de985f564 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleChangedEventCreator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleChangedEventCreator.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.encrypt.event;
-import org.apache.shardingsphere.encrypt.event.encryptor.EncryptorEventCreator;
-import org.apache.shardingsphere.encrypt.event.table.EncryptTableEventCreator;
+import org.apache.shardingsphere.encrypt.event.encryptor.creator.EncryptorEventCreator;
+import org.apache.shardingsphere.encrypt.event.table.creator.EncryptTableEventCreator;
import org.apache.shardingsphere.encrypt.metadata.nodepath.EncryptRuleNodePathProvider;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/encryptor/CompatibleEncryptorEventCreator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/encryptor/creator/CompatibleEncryptorEventCreator.java
similarity index 85%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/encryptor/CompatibleEncryptorEventCreator.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/encryptor/creator/CompatibleEncryptorEventCreator.java
index 80189b44d9a..12771c4a89c 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/encryptor/CompatibleEncryptorEventCreator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/encryptor/creator/CompatibleEncryptorEventCreator.java
@@ -15,8 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.event.compatible.encryptor;
+package org.apache.shardingsphere.encrypt.event.compatible.encryptor.creator;
+import org.apache.shardingsphere.encrypt.event.compatible.encryptor.AlterCompatibleEncryptorEvent;
+import org.apache.shardingsphere.encrypt.event.compatible.encryptor.DeleteCompatibleEncryptorEvent;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
@@ -24,7 +26,9 @@ import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
/**
* Compatible encryptor event creator.
+ * @deprecated compatible support will remove in next version.
*/
+@Deprecated
public final class CompatibleEncryptorEventCreator implements NamedRuleItemChangedEventCreator {
@Override
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/table/CompatibleEncryptTableEventCreator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/table/creator/CompatibleEncryptTableEventCreator.java
similarity index 83%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/table/CompatibleEncryptTableEventCreator.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/table/creator/CompatibleEncryptTableEventCreator.java
index 22a2caa5845..0b77b1d501d 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/table/CompatibleEncryptTableEventCreator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/compatible/table/creator/CompatibleEncryptTableEventCreator.java
@@ -15,8 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.event.compatible.table;
+package org.apache.shardingsphere.encrypt.event.compatible.table.creator;
+import org.apache.shardingsphere.encrypt.event.compatible.table.AddCompatibleEncryptTableEvent;
+import org.apache.shardingsphere.encrypt.event.compatible.table.AlterCompatibleEncryptTableEvent;
+import org.apache.shardingsphere.encrypt.event.compatible.table.DeleteCompatibleEncryptTableEvent;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
@@ -24,7 +27,9 @@ import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
/**
* Compatible encrypt table event creator.
+ * @deprecated compatible support will remove in next version.
*/
+@Deprecated
public final class CompatibleEncryptTableEventCreator implements NamedRuleItemChangedEventCreator {
@Override
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/encryptor/EncryptorEventCreator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/encryptor/creator/EncryptorEventCreator.java
similarity index 87%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/encryptor/EncryptorEventCreator.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/encryptor/creator/EncryptorEventCreator.java
index 694b143f94c..a4a90cc5d68 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/encryptor/EncryptorEventCreator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/encryptor/creator/EncryptorEventCreator.java
@@ -15,8 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.event.encryptor;
+package org.apache.shardingsphere.encrypt.event.encryptor.creator;
+import org.apache.shardingsphere.encrypt.event.encryptor.AlterEncryptorEvent;
+import org.apache.shardingsphere.encrypt.event.encryptor.DeleteEncryptorEvent;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/table/EncryptTableEventCreator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/table/creator/EncryptTableEventCreator.java
similarity index 85%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/table/EncryptTableEventCreator.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/table/creator/EncryptTableEventCreator.java
index 82ec6598765..e7d95fffc7e 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/table/EncryptTableEventCreator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/table/creator/EncryptTableEventCreator.java
@@ -15,8 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.event.table;
+package org.apache.shardingsphere.encrypt.event.table.creator;
+import org.apache.shardingsphere.encrypt.event.table.AddEncryptTableEvent;
+import org.apache.shardingsphere.encrypt.event.table.AlterEncryptTableEvent;
+import org.apache.shardingsphere.encrypt.event.table.DeleteEncryptTableEvent;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleChangedEventCreator.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleChangedEventCreator.java
index 3fae974ebc7..963dd46278d 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleChangedEventCreator.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleChangedEventCreator.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.mask.event;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
-import org.apache.shardingsphere.mask.event.algorithm.MaskEventCreator;
-import org.apache.shardingsphere.mask.event.table.MaskTableCreator;
+import org.apache.shardingsphere.mask.event.algorithm.creator.MaskEventCreator;
+import org.apache.shardingsphere.mask.event.table.creator.MaskTableCreator;
import org.apache.shardingsphere.mask.metadata.nodepath.MaskRuleNodePathProvider;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/algorithm/MaskEventCreator.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/algorithm/creator/MaskEventCreator.java
similarity index 87%
rename from features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/algorithm/MaskEventCreator.java
rename to features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/algorithm/creator/MaskEventCreator.java
index 3c317a473af..ac76746ecf3 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/algorithm/MaskEventCreator.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/algorithm/creator/MaskEventCreator.java
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mask.event.algorithm;
+package org.apache.shardingsphere.mask.event.algorithm.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
+import org.apache.shardingsphere.mask.event.algorithm.AlterMaskAlgorithmEvent;
+import org.apache.shardingsphere.mask.event.algorithm.DeleteMaskAlgorithmEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/table/MaskTableCreator.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/table/creator/MaskTableCreator.java
similarity index 86%
rename from features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/table/MaskTableCreator.java
rename to features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/table/creator/MaskTableCreator.java
index 84662af2b8b..6ebc8db25bf 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/table/MaskTableCreator.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/table/creator/MaskTableCreator.java
@@ -15,9 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mask.event.table;
+package org.apache.shardingsphere.mask.event.table.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
+import org.apache.shardingsphere.mask.event.table.AddMaskTableEvent;
+import org.apache.shardingsphere.mask.event.table.AlterMaskTableEvent;
+import org.apache.shardingsphere.mask.event.table.DeleteMaskTableEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleChangedEventCreator.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleChangedEventCreator.java
index 0f4651a43a7..04b4f0d98a5 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleChangedEventCreator.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleChangedEventCreator.java
@@ -21,8 +21,8 @@ import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
import org.apache.shardingsphere.mode.spi.RuleChangedEventCreator;
-import org.apache.shardingsphere.readwritesplitting.event.datasource.ReadwriteSplittingDataSourceEventCreator;
-import org.apache.shardingsphere.readwritesplitting.event.loadbalance.ReadwriteSplittingLoadBalancerEventCreator;
+import org.apache.shardingsphere.readwritesplitting.event.datasource.creator.ReadwriteSplittingDataSourceEventCreator;
+import org.apache.shardingsphere.readwritesplitting.event.loadbalance.creator.ReadwriteSplittingLoadBalancerEventCreator;
import org.apache.shardingsphere.readwritesplitting.metadata.nodepath.ReadwriteSplittingRuleNodePathProvider;
/**
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/datasource/ReadwriteSplittingDataSourceEventCreator.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/datasource/creator/ReadwriteSplittingDataSourceEventCreator.java
similarity index 84%
rename from features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/datasource/ReadwriteSplittingDataSourceEventCreator.java
rename to features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/datasource/creator/ReadwriteSplittingDataSourceEventCreator.java
index e87b3c8fc11..fc55a335820 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/datasource/ReadwriteSplittingDataSourceEventCreator.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/datasource/creator/ReadwriteSplittingDataSourceEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.readwritesplitting.event.datasource;
+package org.apache.shardingsphere.readwritesplitting.event.datasource.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.readwritesplitting.event.datasource.AddReadwriteSplittingDataSourceEvent;
+import org.apache.shardingsphere.readwritesplitting.event.datasource.AlterReadwriteSplittingDataSourceEvent;
+import org.apache.shardingsphere.readwritesplitting.event.datasource.DeleteReadwriteSplittingDataSourceEvent;
/**
* Readwrite-splitting data source event creator.
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/AlterLoadBalancerEvent.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/AlterReadwriteSplittingLoadBalancerEvent.java
similarity index 89%
rename from features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/AlterLoadBalancerEvent.java
rename to features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/AlterReadwriteSplittingLoadBalancerEvent.java
index 3f10cdb56da..ee81afd15c5 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/AlterLoadBalancerEvent.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/AlterReadwriteSplittingLoadBalancerEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter load-balancer event.
+ * Alter readwrite-splitting load-balancer event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterLoadBalancerEvent implements GovernanceEvent {
+public final class AlterReadwriteSplittingLoadBalancerEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/DeleteLoadBalancerEvent.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/DeleteReadwriteSplittingLoadBalancerEvent.java
similarity index 88%
rename from features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/DeleteLoadBalancerEvent.java
rename to features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/DeleteReadwriteSplittingLoadBalancerEvent.java
index 9892b85e538..78aaf2d501a 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/DeleteLoadBalancerEvent.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/DeleteReadwriteSplittingLoadBalancerEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete load-balancer event.
+ * Delete readwrite-splitting load-balancer event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteLoadBalancerEvent implements GovernanceEvent {
+public final class DeleteReadwriteSplittingLoadBalancerEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/ReadwriteSplittingLoadBalancerEventCreator.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/creator/ReadwriteSplittingLoadBalancerEventCreator.java
similarity index 76%
rename from features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/ReadwriteSplittingLoadBalancerEventCreator.java
rename to features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/creator/ReadwriteSplittingLoadBalancerEventCreator.java
index 4483e12e5ae..77d7edfd321 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/ReadwriteSplittingLoadBalancerEventCreator.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/loadbalance/creator/ReadwriteSplittingLoadBalancerEventCreator.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.readwritesplitting.event.loadbalance;
+package org.apache.shardingsphere.readwritesplitting.event.loadbalance.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.readwritesplitting.event.loadbalance.AlterReadwriteSplittingLoadBalancerEvent;
+import org.apache.shardingsphere.readwritesplitting.event.loadbalance.DeleteReadwriteSplittingLoadBalancerEvent;
/**
* Readwrite-splitting load-balancer event creator.
@@ -30,8 +32,8 @@ public final class ReadwriteSplittingLoadBalancerEventCreator implements NamedRu
@Override
public GovernanceEvent create(final String databaseName, final String loadBalancerName, final DataChangedEvent event) {
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return new AlterLoadBalancerEvent(databaseName, loadBalancerName, event.getKey(), event.getValue());
+ return new AlterReadwriteSplittingLoadBalancerEvent(databaseName, loadBalancerName, event.getKey(), event.getValue());
}
- return new DeleteLoadBalancerEvent(databaseName, loadBalancerName);
+ return new DeleteReadwriteSplittingLoadBalancerEvent(databaseName, loadBalancerName);
}
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java
index 45e24c73ca4..0ea27631fbe 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChan
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
-import org.apache.shardingsphere.readwritesplitting.event.loadbalance.AlterLoadBalancerEvent;
-import org.apache.shardingsphere.readwritesplitting.event.loadbalance.DeleteLoadBalancerEvent;
+import org.apache.shardingsphere.readwritesplitting.event.loadbalance.AlterReadwriteSplittingLoadBalancerEvent;
+import org.apache.shardingsphere.readwritesplitting.event.loadbalance.DeleteReadwriteSplittingLoadBalancerEvent;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
import java.util.LinkedHashMap;
@@ -52,7 +52,7 @@ public final class ReadwriteSplittingLoadBalanceSubscriber implements RuleChange
* @param event alter load-balance event
*/
@Subscribe
- public synchronized void renew(final AlterLoadBalancerEvent event) {
+ public synchronized void renew(final AlterReadwriteSplittingLoadBalancerEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -68,7 +68,7 @@ public final class ReadwriteSplittingLoadBalanceSubscriber implements RuleChange
* @param event delete load-balance event
*/
@Subscribe
- public synchronized void renew(final DeleteLoadBalancerEvent event) {
+ public synchronized void renew(final DeleteReadwriteSplittingLoadBalancerEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/ShadowRuleChangedEventCreator.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/ShadowRuleChangedEventCreator.java
index af8399fc981..094c0bacaf8 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/ShadowRuleChangedEventCreator.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/ShadowRuleChangedEventCreator.java
@@ -22,10 +22,10 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
import org.apache.shardingsphere.mode.spi.RuleChangedEventCreator;
-import org.apache.shardingsphere.shadow.event.algorithm.DefaultShadowAlgorithmEventCreator;
-import org.apache.shardingsphere.shadow.event.algorithm.ShadowAlgorithmEventCreator;
-import org.apache.shardingsphere.shadow.event.datasource.ShadowDataSourceEventCreator;
-import org.apache.shardingsphere.shadow.event.table.ShadowTableEventCreator;
+import org.apache.shardingsphere.shadow.event.algorithm.creator.DefaultShadowAlgorithmEventCreator;
+import org.apache.shardingsphere.shadow.event.algorithm.creator.ShadowAlgorithmEventCreator;
+import org.apache.shardingsphere.shadow.event.datasource.creator.ShadowDataSourceEventCreator;
+import org.apache.shardingsphere.shadow.event.table.creator.ShadowTableEventCreator;
import org.apache.shardingsphere.shadow.metadata.nodepath.ShadowRuleNodePathProvider;
/**
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/DefaultShadowAlgorithmEventCreator.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/creator/DefaultShadowAlgorithmEventCreator.java
similarity index 86%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/DefaultShadowAlgorithmEventCreator.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/creator/DefaultShadowAlgorithmEventCreator.java
index 16023c96d15..cbbceacb1fb 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/DefaultShadowAlgorithmEventCreator.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/creator/DefaultShadowAlgorithmEventCreator.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.shadow.event.algorithm;
+package org.apache.shardingsphere.shadow.event.algorithm.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.shadow.event.algorithm.AlterDefaultShadowAlgorithmNameEvent;
+import org.apache.shardingsphere.shadow.event.algorithm.DeleteDefaultShadowAlgorithmNameEvent;
/**
* Default shadow algorithm event creator.
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/ShadowAlgorithmEventCreator.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/creator/ShadowAlgorithmEventCreator.java
similarity index 87%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/ShadowAlgorithmEventCreator.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/creator/ShadowAlgorithmEventCreator.java
index 96c8d5d312d..bbeae5ea2dc 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/ShadowAlgorithmEventCreator.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/algorithm/creator/ShadowAlgorithmEventCreator.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.shadow.event.algorithm;
+package org.apache.shardingsphere.shadow.event.algorithm.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.shadow.event.algorithm.AlterShadowAlgorithmEvent;
+import org.apache.shardingsphere.shadow.event.algorithm.DeleteShadowAlgorithmEvent;
/**
* Shadow algorithm event creator.
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/datasource/ShadowDataSourceEventCreator.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/datasource/creator/ShadowDataSourceEventCreator.java
similarity index 84%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/datasource/ShadowDataSourceEventCreator.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/datasource/creator/ShadowDataSourceEventCreator.java
index 215369dbe20..4be99e02533 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/datasource/ShadowDataSourceEventCreator.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/datasource/creator/ShadowDataSourceEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.shadow.event.datasource;
+package org.apache.shardingsphere.shadow.event.datasource.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.shadow.event.datasource.AddShadowDataSourceEvent;
+import org.apache.shardingsphere.shadow.event.datasource.AlterShadowDataSourceEvent;
+import org.apache.shardingsphere.shadow.event.datasource.DeleteShadowDataSourceEvent;
/**
* Shadow data source event creator.
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/table/ShadowTableEventCreator.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/table/creator/ShadowTableEventCreator.java
similarity index 85%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/table/ShadowTableEventCreator.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/table/creator/ShadowTableEventCreator.java
index 003ef33f786..0f0058b7233 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/table/ShadowTableEventCreator.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/event/table/creator/ShadowTableEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.shadow.event.table;
+package org.apache.shardingsphere.shadow.event.table.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.shadow.event.table.AddShadowTableEvent;
+import org.apache.shardingsphere.shadow.event.table.AlterShadowTableEvent;
+import org.apache.shardingsphere.shadow.event.table.DeleteShadowTableEvent;
/**
* Shadow table event creator.
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/ShardingRuleChangedEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/ShardingRuleChangedEventCreator.java
index 467b0561950..216d959935f 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/ShardingRuleChangedEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/ShardingRuleChangedEventCreator.java
@@ -22,18 +22,18 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
import org.apache.shardingsphere.mode.spi.RuleChangedEventCreator;
-import org.apache.shardingsphere.sharding.event.algorithm.auditor.AuditEventCreator;
-import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.KeyGeneratorEventCreator;
-import org.apache.shardingsphere.sharding.event.algorithm.sharding.ShardingAlgorithmEventCreator;
-import org.apache.shardingsphere.sharding.event.cache.ShardingCacheEventCreator;
-import org.apache.shardingsphere.sharding.event.strategy.audit.ShardingAuditorStrategyEventCreator;
-import org.apache.shardingsphere.sharding.event.strategy.database.DatabaseShardingStrategyEventCreator;
-import org.apache.shardingsphere.sharding.event.strategy.keygenerate.KeyGenerateStrategyEventCreator;
-import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.DefaultShardingColumnEventCreator;
-import org.apache.shardingsphere.sharding.event.strategy.table.TableShardingStrategyEventCreator;
-import org.apache.shardingsphere.sharding.event.table.auto.ShardingAutoTableEventCreator;
-import org.apache.shardingsphere.sharding.event.table.binding.ShardingTableReferenceEventCreator;
-import org.apache.shardingsphere.sharding.event.table.sharding.ShardingTableEventCreator;
+import org.apache.shardingsphere.sharding.event.algorithm.auditor.creator.AuditShardingEventCreator;
+import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.creator.KeyGeneratorEventCreator;
+import org.apache.shardingsphere.sharding.event.algorithm.sharding.creator.ShardingAlgorithmEventCreator;
+import org.apache.shardingsphere.sharding.event.cache.creator.ShardingCacheEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.audit.creator.ShardingAuditorStrategyEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.database.creator.DefaultDatabaseShardingStrategyEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.keygenerate.creator.DefaultKeyGenerateStrategyEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.creator.DefaultShardingColumnEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.table.creator.DefaultTableShardingStrategyEventCreator;
+import org.apache.shardingsphere.sharding.event.table.auto.creator.ShardingAutoTableEventCreator;
+import org.apache.shardingsphere.sharding.event.table.binding.creator.ShardingTableReferenceEventCreator;
+import org.apache.shardingsphere.sharding.event.table.sharding.creator.ShardingTableEventCreator;
import org.apache.shardingsphere.sharding.metadata.nodepath.ShardingRuleNodePathProvider;
/**
@@ -64,7 +64,7 @@ public final class ShardingRuleChangedEventCreator implements RuleChangedEventCr
case ShardingRuleNodePathProvider.KEY_GENERATORS:
return new KeyGeneratorEventCreator();
case ShardingRuleNodePathProvider.AUDITORS:
- return new AuditEventCreator();
+ return new AuditShardingEventCreator();
default:
throw new UnsupportedOperationException(itemType);
}
@@ -73,11 +73,11 @@ public final class ShardingRuleChangedEventCreator implements RuleChangedEventCr
private UniqueRuleItemChangedEventCreator getUniqueRuleItemChangedEventCreator(final String itemType) {
switch (itemType) {
case ShardingRuleNodePathProvider.DEFAULT_DATABASE_STRATEGY:
- return new DatabaseShardingStrategyEventCreator();
+ return new DefaultDatabaseShardingStrategyEventCreator();
case ShardingRuleNodePathProvider.DEFAULT_TABLE_STRATEGY:
- return new TableShardingStrategyEventCreator();
+ return new DefaultTableShardingStrategyEventCreator();
case ShardingRuleNodePathProvider.DEFAULT_KEY_GENERATE_STRATEGY:
- return new KeyGenerateStrategyEventCreator();
+ return new DefaultKeyGenerateStrategyEventCreator();
case ShardingRuleNodePathProvider.DEFAULT_AUDIT_STRATEGY:
return new ShardingAuditorStrategyEventCreator();
case ShardingRuleNodePathProvider.DEFAULT_SHARDING_COLUMN:
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AlterAuditorEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AlterShardingAuditorEvent.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AlterAuditorEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AlterShardingAuditorEvent.java
index 699fd5ccaed..950c94fb607 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AlterAuditorEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AlterShardingAuditorEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter auditor event.
+ * Alter sharding auditor event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterAuditorEvent implements GovernanceEvent {
+public final class AlterShardingAuditorEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/DeleteAuditorEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/DeleteShardingAuditorEvent.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/DeleteAuditorEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/DeleteShardingAuditorEvent.java
index 0d18f6f42cb..5dd7766e671 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/DeleteAuditorEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/DeleteShardingAuditorEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete auditor event.
+ * Delete sharding auditor event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteAuditorEvent implements GovernanceEvent {
+public final class DeleteShardingAuditorEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AuditEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/creator/AuditShardingEventCreator.java
similarity index 73%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AuditEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/creator/AuditShardingEventCreator.java
index 72ae118c3ee..fd9fc96d821 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/AuditEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/auditor/creator/AuditShardingEventCreator.java
@@ -15,23 +15,25 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.algorithm.auditor;
+package org.apache.shardingsphere.sharding.event.algorithm.auditor.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.algorithm.auditor.AlterShardingAuditorEvent;
+import org.apache.shardingsphere.sharding.event.algorithm.auditor.DeleteShardingAuditorEvent;
/**
- * Audit event creator.
+ * Audit sharding event creator.
*/
-public final class AuditEventCreator implements NamedRuleItemChangedEventCreator {
+public final class AuditShardingEventCreator implements NamedRuleItemChangedEventCreator {
@Override
public GovernanceEvent create(final String databaseName, final String algorithmName, final DataChangedEvent event) {
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return new AlterAuditorEvent(databaseName, algorithmName, event.getKey(), event.getValue());
+ return new AlterShardingAuditorEvent(databaseName, algorithmName, event.getKey(), event.getValue());
}
- return new DeleteAuditorEvent(databaseName, algorithmName);
+ return new DeleteShardingAuditorEvent(databaseName, algorithmName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/keygenerator/KeyGeneratorEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/keygenerator/creator/KeyGeneratorEventCreator.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/keygenerator/KeyGeneratorEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/keygenerator/creator/KeyGeneratorEventCreator.java
index 9865f16dffe..d2d7f289b9c 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/keygenerator/KeyGeneratorEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/keygenerator/creator/KeyGeneratorEventCreator.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.algorithm.keygenerator;
+package org.apache.shardingsphere.sharding.event.algorithm.keygenerator.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.AlterKeyGeneratorEvent;
+import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.DeleteKeyGeneratorEvent;
/**
* Key generator event creator.
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/sharding/ShardingAlgorithmEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/sharding/creator/ShardingAlgorithmEventCreator.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/sharding/ShardingAlgorithmEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/sharding/creator/ShardingAlgorithmEventCreator.java
index c84a6ee8a83..aeb921eff83 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/sharding/ShardingAlgorithmEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/algorithm/sharding/creator/ShardingAlgorithmEventCreator.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.algorithm.sharding;
+package org.apache.shardingsphere.sharding.event.algorithm.sharding.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.algorithm.sharding.AlterShardingAlgorithmEvent;
+import org.apache.shardingsphere.sharding.event.algorithm.sharding.DeleteShardingAlgorithmEvent;
/**
* Sharding algorithm event creator.
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AddShardingCacheConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AddShardingCacheEvent.java
similarity index 90%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AddShardingCacheConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AddShardingCacheEvent.java
index e60fb32dc8f..69ceeca33d6 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AddShardingCacheConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AddShardingCacheEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Add sharding cache configuration event.
+ * Add sharding cache event.
*/
@RequiredArgsConstructor
@Getter
-public final class AddShardingCacheConfigurationEvent implements GovernanceEvent {
+public final class AddShardingCacheEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AlterShardingCacheConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AlterShardingCacheEvent.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AlterShardingCacheConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AlterShardingCacheEvent.java
index ce1f9e4850f..332563ef28c 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AlterShardingCacheConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/AlterShardingCacheEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter sharding cache configuration event.
+ * Alter sharding cache event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterShardingCacheConfigurationEvent implements GovernanceEvent {
+public final class AlterShardingCacheEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/DeleteShardingCacheConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/DeleteShardingCacheEvent.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/DeleteShardingCacheConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/DeleteShardingCacheEvent.java
index 9e0878bc652..61ae3c04370 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/DeleteShardingCacheConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/DeleteShardingCacheEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete sharding cache configuration event.
+ * Delete sharding cache event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteShardingCacheConfigurationEvent implements GovernanceEvent {
+public final class DeleteShardingCacheEvent implements GovernanceEvent {
private final String databaseName;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/ShardingCacheEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/creator/ShardingCacheEventCreator.java
similarity index 72%
copy from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/ShardingCacheEventCreator.java
copy to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/creator/ShardingCacheEventCreator.java
index 612e64d5b11..f5373a69b53 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/ShardingCacheEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/creator/ShardingCacheEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.cache;
+package org.apache.shardingsphere.sharding.event.cache.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.cache.AddShardingCacheEvent;
+import org.apache.shardingsphere.sharding.event.cache.AlterShardingCacheEvent;
+import org.apache.shardingsphere.sharding.event.cache.DeleteShardingCacheEvent;
/**
* Sharding cache event creator.
@@ -30,11 +33,11 @@ public final class ShardingCacheEventCreator implements UniqueRuleItemChangedEve
@Override
public GovernanceEvent create(final String databaseName, final DataChangedEvent event) {
if (Type.ADDED == event.getType()) {
- return new AddShardingCacheConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AddShardingCacheEvent(databaseName, event.getKey(), event.getValue());
}
if (Type.UPDATED == event.getType()) {
- return new AlterShardingCacheConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AlterShardingCacheEvent(databaseName, event.getKey(), event.getValue());
}
- return new DeleteShardingCacheConfigurationEvent(databaseName);
+ return new DeleteShardingCacheEvent(databaseName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/audit/ShardingAuditorStrategyEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/audit/creator/ShardingAuditorStrategyEventCreator.java
similarity index 81%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/audit/ShardingAuditorStrategyEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/audit/creator/ShardingAuditorStrategyEventCreator.java
index 0845200b979..853a88dd123 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/audit/ShardingAuditorStrategyEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/audit/creator/ShardingAuditorStrategyEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.strategy.audit;
+package org.apache.shardingsphere.sharding.event.strategy.audit.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.audit.AddShardingAuditorStrategyConfigurationEvent;
+import org.apache.shardingsphere.sharding.event.strategy.audit.AlterShardingAuditorStrategyConfigurationEvent;
+import org.apache.shardingsphere.sharding.event.strategy.audit.DeleteShardingAuditorStrategyConfigurationEvent;
/**
* Sharding auditor strategy event creator.
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AddDatabaseShardingStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AddDefaultDatabaseShardingStrategyEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AddDatabaseShardingStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AddDefaultDatabaseShardingStrategyEvent.java
index 76e80a8f520..a5a1e8dce8f 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AddDatabaseShardingStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AddDefaultDatabaseShardingStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Add default database sharding strategy configuration event.
+ * Add default database sharding strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class AddDatabaseShardingStrategyConfigurationEvent implements GovernanceEvent {
+public final class AddDefaultDatabaseShardingStrategyEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AlterDatabaseShardingStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AlterDefaultDatabaseShardingStrategyEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AlterDatabaseShardingStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AlterDefaultDatabaseShardingStrategyEvent.java
index 291c0a6cc29..ce894b7973a 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AlterDatabaseShardingStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/AlterDefaultDatabaseShardingStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter default database sharding strategy configuration event.
+ * Alter default database sharding strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterDatabaseShardingStrategyConfigurationEvent implements GovernanceEvent {
+public final class AlterDefaultDatabaseShardingStrategyEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DeleteDatabaseShardingStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DeleteDefaultDatabaseShardingStrategyEvent.java
similarity index 86%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DeleteDatabaseShardingStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DeleteDefaultDatabaseShardingStrategyEvent.java
index a6043d15ad9..69c8e062f2c 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DeleteDatabaseShardingStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DeleteDefaultDatabaseShardingStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete default database sharding strategy configuration event.
+ * Delete default database sharding strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteDatabaseShardingStrategyConfigurationEvent implements GovernanceEvent {
+public final class DeleteDefaultDatabaseShardingStrategyEvent implements GovernanceEvent {
private final String databaseName;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DatabaseShardingStrategyEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/creator/DefaultDatabaseShardingStrategyEventCreator.java
similarity index 63%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DatabaseShardingStrategyEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/creator/DefaultDatabaseShardingStrategyEventCreator.java
index 65954ffc355..e980d204121 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/DatabaseShardingStrategyEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/database/creator/DefaultDatabaseShardingStrategyEventCreator.java
@@ -15,26 +15,29 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.strategy.database;
+package org.apache.shardingsphere.sharding.event.strategy.database.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.database.AddDefaultDatabaseShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.database.AlterDefaultDatabaseShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.database.DeleteDefaultDatabaseShardingStrategyEvent;
/**
- * Database sharding strategy event creator.
+ * Default database sharding strategy event creator.
*/
-public final class DatabaseShardingStrategyEventCreator implements UniqueRuleItemChangedEventCreator {
+public final class DefaultDatabaseShardingStrategyEventCreator implements UniqueRuleItemChangedEventCreator {
@Override
public GovernanceEvent create(final String databaseName, final DataChangedEvent event) {
if (Type.ADDED == event.getType()) {
- return new AddDatabaseShardingStrategyConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AddDefaultDatabaseShardingStrategyEvent(databaseName, event.getKey(), event.getValue());
}
if (Type.UPDATED == event.getType()) {
- return new AlterDatabaseShardingStrategyConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AlterDefaultDatabaseShardingStrategyEvent(databaseName, event.getKey(), event.getValue());
}
- return new DeleteDatabaseShardingStrategyConfigurationEvent(databaseName);
+ return new DeleteDefaultDatabaseShardingStrategyEvent(databaseName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AddKeyGenerateStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AddDefaultKeyGenerateStrategyEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AddKeyGenerateStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AddDefaultKeyGenerateStrategyEvent.java
index 147be6d6884..9746a0994e8 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AddKeyGenerateStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AddDefaultKeyGenerateStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Add default key generate strategy configuration event.
+ * Add default key generate strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class AddKeyGenerateStrategyConfigurationEvent implements GovernanceEvent {
+public final class AddDefaultKeyGenerateStrategyEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AlterKeyGenerateStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AlterDefaultKeyGenerateStrategyEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AlterKeyGenerateStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AlterDefaultKeyGenerateStrategyEvent.java
index 724faa81a2a..fa785dddc9c 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AlterKeyGenerateStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/AlterDefaultKeyGenerateStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter default key generate strategy configuration event.
+ * Alter default key generate strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterKeyGenerateStrategyConfigurationEvent implements GovernanceEvent {
+public final class AlterDefaultKeyGenerateStrategyEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/DeleteKeyGenerateStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/DeleteDefaultKeyGenerateStrategyEvent.java
similarity index 87%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/DeleteKeyGenerateStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/DeleteDefaultKeyGenerateStrategyEvent.java
index 5ea261f2bdc..d1219a1d199 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/DeleteKeyGenerateStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/DeleteDefaultKeyGenerateStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete default key generate strategy configuration event.
+ * Delete default key generate strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteKeyGenerateStrategyConfigurationEvent implements GovernanceEvent {
+public final class DeleteDefaultKeyGenerateStrategyEvent implements GovernanceEvent {
private final String databaseName;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/KeyGenerateStrategyEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/creator/DefaultKeyGenerateStrategyEventCreator.java
similarity index 64%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/KeyGenerateStrategyEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/creator/DefaultKeyGenerateStrategyEventCreator.java
index 98924370492..cc133fdca48 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/KeyGenerateStrategyEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/keygenerate/creator/DefaultKeyGenerateStrategyEventCreator.java
@@ -15,26 +15,29 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.strategy.keygenerate;
+package org.apache.shardingsphere.sharding.event.strategy.keygenerate.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.keygenerate.AddDefaultKeyGenerateStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.keygenerate.AlterDefaultKeyGenerateStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.keygenerate.DeleteDefaultKeyGenerateStrategyEvent;
/**
- * Key generate strategy event creator.
+ * Default key generate strategy event creator.
*/
-public final class KeyGenerateStrategyEventCreator implements UniqueRuleItemChangedEventCreator {
+public final class DefaultKeyGenerateStrategyEventCreator implements UniqueRuleItemChangedEventCreator {
@Override
public GovernanceEvent create(final String databaseName, final DataChangedEvent event) {
if (Type.ADDED == event.getType()) {
- return new AddKeyGenerateStrategyConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AddDefaultKeyGenerateStrategyEvent(databaseName, event.getKey(), event.getValue());
}
if (Type.UPDATED == event.getType()) {
- return new AlterKeyGenerateStrategyConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AlterDefaultKeyGenerateStrategyEvent(databaseName, event.getKey(), event.getValue());
}
- return new DeleteKeyGenerateStrategyConfigurationEvent(databaseName);
+ return new DeleteDefaultKeyGenerateStrategyEvent(databaseName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/shardingcolumn/DefaultShardingColumnEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/shardingcolumn/creator/DefaultShardingColumnEventCreator.java
similarity index 84%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/shardingcolumn/DefaultShardingColumnEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/shardingcolumn/creator/DefaultShardingColumnEventCreator.java
index 9243f4f820a..106f474f9cc 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/shardingcolumn/DefaultShardingColumnEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/shardingcolumn/creator/DefaultShardingColumnEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.strategy.shardingcolumn;
+package org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.AddDefaultShardingColumnEvent;
+import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.AlterDefaultShardingColumnEvent;
+import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.DeleteDefaultShardingColumnEvent;
/**
* Default sharding column event creator.
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AddTableShardingStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AddDefaultTableShardingStrategyEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AddTableShardingStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AddDefaultTableShardingStrategyEvent.java
index b51a9b3c627..9b6fe9913c4 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AddTableShardingStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AddDefaultTableShardingStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Add default database sharding strategy configuration event.
+ * Add default database sharding strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class AddTableShardingStrategyConfigurationEvent implements GovernanceEvent {
+public final class AddDefaultTableShardingStrategyEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AlterTableShardingStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AlterDefaultTableShardingStrategyEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AlterTableShardingStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AlterDefaultTableShardingStrategyEvent.java
index bab4e5cca7c..058183b2f42 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AlterTableShardingStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/AlterDefaultTableShardingStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter default database sharding strategy configuration event.
+ * Alter default database sharding strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterTableShardingStrategyConfigurationEvent implements GovernanceEvent {
+public final class AlterDefaultTableShardingStrategyEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/DeleteTableShardingStrategyConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/DeleteDefaultTableShardingStrategyEvent.java
similarity index 87%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/DeleteTableShardingStrategyConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/DeleteDefaultTableShardingStrategyEvent.java
index 146b9445aeb..36cf47d6192 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/DeleteTableShardingStrategyConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/DeleteDefaultTableShardingStrategyEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete default database sharding strategy configuration event.
+ * Delete default database sharding strategy event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteTableShardingStrategyConfigurationEvent implements GovernanceEvent {
+public final class DeleteDefaultTableShardingStrategyEvent implements GovernanceEvent {
private final String databaseName;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/TableShardingStrategyEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/TableShardingStrategyEventCreator.java
deleted file mode 100644
index 29c831476b3..00000000000
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/TableShardingStrategyEventCreator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.sharding.event.strategy.table;
-
-import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
-import org.apache.shardingsphere.mode.event.DataChangedEvent;
-import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
-
-/**
- * Table sharding strategy event creator.
- */
-public final class TableShardingStrategyEventCreator implements UniqueRuleItemChangedEventCreator {
-
- @Override
- public GovernanceEvent create(final String databaseName, final DataChangedEvent event) {
- if (Type.ADDED == event.getType()) {
- return new AddTableShardingStrategyConfigurationEvent(databaseName, event.getKey(), event.getValue());
- }
- if (Type.UPDATED == event.getType()) {
- return new AlterTableShardingStrategyConfigurationEvent(databaseName, event.getKey(), event.getValue());
- }
- return new DeleteTableShardingStrategyConfigurationEvent(databaseName);
- }
-}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/ShardingCacheEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/creator/DefaultTableShardingStrategyEventCreator.java
similarity index 63%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/ShardingCacheEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/creator/DefaultTableShardingStrategyEventCreator.java
index 612e64d5b11..696d251920d 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/cache/ShardingCacheEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/strategy/table/creator/DefaultTableShardingStrategyEventCreator.java
@@ -15,26 +15,29 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.cache;
+package org.apache.shardingsphere.sharding.event.strategy.table.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.strategy.table.AddDefaultTableShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.table.AlterDefaultTableShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.table.DeleteDefaultTableShardingStrategyEvent;
/**
- * Sharding cache event creator.
+ * Default table sharding strategy event creator.
*/
-public final class ShardingCacheEventCreator implements UniqueRuleItemChangedEventCreator {
+public final class DefaultTableShardingStrategyEventCreator implements UniqueRuleItemChangedEventCreator {
@Override
public GovernanceEvent create(final String databaseName, final DataChangedEvent event) {
if (Type.ADDED == event.getType()) {
- return new AddShardingCacheConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AddDefaultTableShardingStrategyEvent(databaseName, event.getKey(), event.getValue());
}
if (Type.UPDATED == event.getType()) {
- return new AlterShardingCacheConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AlterDefaultTableShardingStrategyEvent(databaseName, event.getKey(), event.getValue());
}
- return new DeleteShardingCacheConfigurationEvent(databaseName);
+ return new DeleteDefaultTableShardingStrategyEvent(databaseName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AddShardingAutoTableConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AddShardingAutoTableEvent.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AddShardingAutoTableConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AddShardingAutoTableEvent.java
index daa0bee68d0..ab4e7bfca91 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AddShardingAutoTableConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AddShardingAutoTableEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Add sharding auto table configuration event.
+ * Add sharding auto table event.
*/
@RequiredArgsConstructor
@Getter
-public final class AddShardingAutoTableConfigurationEvent implements GovernanceEvent {
+public final class AddShardingAutoTableEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AlterShardingAutoTableConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AlterShardingAutoTableEvent.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AlterShardingAutoTableConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AlterShardingAutoTableEvent.java
index f30b2639c83..2dbe20544e1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AlterShardingAutoTableConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/AlterShardingAutoTableEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter sharding auto table configuration event.
+ * Alter sharding auto table event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterShardingAutoTableConfigurationEvent implements GovernanceEvent {
+public final class AlterShardingAutoTableEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/DeleteShardingAutoTableConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/DeleteShardingAutoTableEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/DeleteShardingAutoTableConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/DeleteShardingAutoTableEvent.java
index b41ff63eb70..df1ada898b1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/DeleteShardingAutoTableConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/DeleteShardingAutoTableEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete sharding auto table configuration event.
+ * Delete sharding auto table event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteShardingAutoTableConfigurationEvent implements GovernanceEvent {
+public final class DeleteShardingAutoTableEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/ShardingAutoTableEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/creator/ShardingAutoTableEventCreator.java
similarity index 70%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/ShardingAutoTableEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/creator/ShardingAutoTableEventCreator.java
index e627d7f1bcc..03ed184f985 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/ShardingAutoTableEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/auto/creator/ShardingAutoTableEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.table.auto;
+package org.apache.shardingsphere.sharding.event.table.auto.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.table.auto.AddShardingAutoTableEvent;
+import org.apache.shardingsphere.sharding.event.table.auto.AlterShardingAutoTableEvent;
+import org.apache.shardingsphere.sharding.event.table.auto.DeleteShardingAutoTableEvent;
/**
* Sharding auto table event creator.
@@ -30,11 +33,11 @@ public final class ShardingAutoTableEventCreator implements NamedRuleItemChanged
@Override
public GovernanceEvent create(final String databaseName, final String tableName, final DataChangedEvent event) {
if (Type.ADDED == event.getType()) {
- return new AddShardingAutoTableConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AddShardingAutoTableEvent(databaseName, event.getKey(), event.getValue());
}
if (Type.UPDATED == event.getType()) {
- return new AlterShardingAutoTableConfigurationEvent(databaseName, tableName, event.getKey(), event.getValue());
+ return new AlterShardingAutoTableEvent(databaseName, tableName, event.getKey(), event.getValue());
}
- return new DeleteShardingAutoTableConfigurationEvent(databaseName, tableName);
+ return new DeleteShardingAutoTableEvent(databaseName, tableName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AddShardingTableReferenceConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AddShardingTableReferenceEvent.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AddShardingTableReferenceConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AddShardingTableReferenceEvent.java
index 3e32f47c824..c70527902ef 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AddShardingTableReferenceConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AddShardingTableReferenceEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Add sharding binding table configuration event.
+ * Add sharding table reference event.
*/
@RequiredArgsConstructor
@Getter
-public final class AddShardingTableReferenceConfigurationEvent implements GovernanceEvent {
+public final class AddShardingTableReferenceEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AlterShardingTableReferenceConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AlterShardingTableReferenceEvent.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AlterShardingTableReferenceConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AlterShardingTableReferenceEvent.java
index a401c023313..bbee73be520 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AlterShardingTableReferenceConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/AlterShardingTableReferenceEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter sharding binding table configuration event.
+ * Alter sharding table reference event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterShardingTableReferenceConfigurationEvent implements GovernanceEvent {
+public final class AlterShardingTableReferenceEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/DeleteShardingTableReferenceConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/DeleteShardingTableReferenceEvent.java
similarity index 88%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/DeleteShardingTableReferenceConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/DeleteShardingTableReferenceEvent.java
index a90200956df..32a6bd5b072 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/DeleteShardingTableReferenceConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/DeleteShardingTableReferenceEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete sharding binding table configuration event.
+ * Delete sharding table reference event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteShardingTableReferenceConfigurationEvent implements GovernanceEvent {
+public final class DeleteShardingTableReferenceEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/ShardingTableReferenceEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/creator/ShardingTableReferenceEventCreator.java
similarity index 69%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/ShardingTableReferenceEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/creator/ShardingTableReferenceEventCreator.java
index 7438b133e68..3a5bfa87657 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/ShardingTableReferenceEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/binding/creator/ShardingTableReferenceEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.table.binding;
+package org.apache.shardingsphere.sharding.event.table.binding.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.table.binding.AddShardingTableReferenceEvent;
+import org.apache.shardingsphere.sharding.event.table.binding.AlterShardingTableReferenceEvent;
+import org.apache.shardingsphere.sharding.event.table.binding.DeleteShardingTableReferenceEvent;
/**
* Sharding table reference creator.
@@ -30,11 +33,11 @@ public final class ShardingTableReferenceEventCreator implements NamedRuleItemCh
@Override
public GovernanceEvent create(final String databaseName, final String tableName, final DataChangedEvent event) {
if (Type.ADDED == event.getType()) {
- return new AddShardingTableReferenceConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AddShardingTableReferenceEvent(databaseName, event.getKey(), event.getValue());
}
if (Type.UPDATED == event.getType()) {
- return new AlterShardingTableReferenceConfigurationEvent(databaseName, tableName, event.getKey(), event.getValue());
+ return new AlterShardingTableReferenceEvent(databaseName, tableName, event.getKey(), event.getValue());
}
- return new DeleteShardingTableReferenceConfigurationEvent(databaseName, tableName);
+ return new DeleteShardingTableReferenceEvent(databaseName, tableName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AddShardingTableConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AddShardingTableEvent.java
similarity index 90%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AddShardingTableConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AddShardingTableEvent.java
index a90fe33d8d4..2e29e465a7e 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AddShardingTableConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AddShardingTableEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Add sharding table configuration event.
+ * Add sharding table event.
*/
@RequiredArgsConstructor
@Getter
-public final class AddShardingTableConfigurationEvent implements GovernanceEvent {
+public final class AddShardingTableEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AlterShardingTableConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AlterShardingTableEvent.java
similarity index 90%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AlterShardingTableConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AlterShardingTableEvent.java
index 959f5ebd332..589cc422f9d 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AlterShardingTableConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/AlterShardingTableEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter sharding table configuration event.
+ * Alter sharding table event.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterShardingTableConfigurationEvent implements GovernanceEvent {
+public final class AlterShardingTableEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/DeleteShardingTableConfigurationEvent.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/DeleteShardingTableEvent.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/DeleteShardingTableConfigurationEvent.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/DeleteShardingTableEvent.java
index 53ed30de9af..299feab8583 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/DeleteShardingTableConfigurationEvent.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/DeleteShardingTableEvent.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete sharding table configuration event.
+ * Delete sharding table event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteShardingTableConfigurationEvent implements GovernanceEvent {
+public final class DeleteShardingTableEvent implements GovernanceEvent {
private final String databaseName;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/ShardingTableEventCreator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/creator/ShardingTableEventCreator.java
similarity index 70%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/ShardingTableEventCreator.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/creator/ShardingTableEventCreator.java
index 48d271cfc64..ec23e7dd7a4 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/ShardingTableEventCreator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/event/table/sharding/creator/ShardingTableEventCreator.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.event.table.sharding;
+package org.apache.shardingsphere.sharding.event.table.sharding.creator;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
+import org.apache.shardingsphere.sharding.event.table.sharding.AddShardingTableEvent;
+import org.apache.shardingsphere.sharding.event.table.sharding.AlterShardingTableEvent;
+import org.apache.shardingsphere.sharding.event.table.sharding.DeleteShardingTableEvent;
/**
* Sharding table event creator.
@@ -30,11 +33,11 @@ public final class ShardingTableEventCreator implements NamedRuleItemChangedEven
@Override
public GovernanceEvent create(final String databaseName, final String tableName, final DataChangedEvent event) {
if (Type.ADDED == event.getType()) {
- return new AddShardingTableConfigurationEvent(databaseName, event.getKey(), event.getValue());
+ return new AddShardingTableEvent(databaseName, event.getKey(), event.getValue());
}
if (Type.UPDATED == event.getType()) {
- return new AlterShardingTableConfigurationEvent(databaseName, tableName, event.getKey(), event.getValue());
+ return new AlterShardingTableEvent(databaseName, tableName, event.getKey(), event.getValue());
}
- return new DeleteShardingTableConfigurationEvent(databaseName, tableName);
+ return new DeleteShardingTableEvent(databaseName, tableName);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
index 248f271d02c..711831bbe3c 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChan
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
-import org.apache.shardingsphere.sharding.event.algorithm.auditor.AlterAuditorEvent;
-import org.apache.shardingsphere.sharding.event.algorithm.auditor.DeleteAuditorEvent;
+import org.apache.shardingsphere.sharding.event.algorithm.auditor.AlterShardingAuditorEvent;
+import org.apache.shardingsphere.sharding.event.algorithm.auditor.DeleteShardingAuditorEvent;
import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.AlterKeyGeneratorEvent;
import org.apache.shardingsphere.sharding.event.algorithm.keygenerator.DeleteKeyGeneratorEvent;
import org.apache.shardingsphere.sharding.event.algorithm.sharding.AlterShardingAlgorithmEvent;
@@ -87,7 +87,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
* @param event alter sharding algorithm event
*/
@Subscribe
- public synchronized void renew(final AlterAuditorEvent event) {
+ public synchronized void renew(final AlterShardingAuditorEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -136,7 +136,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
* @param event delete key generator event
*/
@Subscribe
- public synchronized void renew(final DeleteAuditorEvent event) {
+ public synchronized void renew(final DeleteShardingAuditorEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java
index 8c4794055a2..6f2cd1a6b29 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java
@@ -26,9 +26,9 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.cache.ShardingCacheConfiguration;
-import org.apache.shardingsphere.sharding.event.cache.AddShardingCacheConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.cache.AlterShardingCacheConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.cache.DeleteShardingCacheConfigurationEvent;
+import org.apache.shardingsphere.sharding.event.cache.AddShardingCacheEvent;
+import org.apache.shardingsphere.sharding.event.cache.AlterShardingCacheEvent;
+import org.apache.shardingsphere.sharding.event.cache.DeleteShardingCacheEvent;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.yaml.config.cache.YamlShardingCacheConfiguration;
import org.apache.shardingsphere.sharding.yaml.swapper.cache.YamlShardingCacheConfigurationSwapper;
@@ -50,7 +50,7 @@ public final class ShardingCacheConfigurationSubscriber implements RuleChangedSu
* @param event add sharding cache configuration event
*/
@Subscribe
- public synchronized void renew(final AddShardingCacheConfigurationEvent event) {
+ public synchronized void renew(final AddShardingCacheEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -74,7 +74,7 @@ public final class ShardingCacheConfigurationSubscriber implements RuleChangedSu
* @param event alter sharding cache configuration event
*/
@Subscribe
- public synchronized void renew(final AlterShardingCacheConfigurationEvent event) {
+ public synchronized void renew(final AlterShardingCacheEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -92,7 +92,7 @@ public final class ShardingCacheConfigurationSubscriber implements RuleChangedSu
* @param event delete sharding cache configuration event
*/
@Subscribe
- public synchronized void renew(final DeleteShardingCacheConfigurationEvent event) {
+ public synchronized void renew(final DeleteShardingCacheEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
index ffed21d8cad..b78faf203bb 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
@@ -31,18 +31,18 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingS
import org.apache.shardingsphere.sharding.event.strategy.audit.AddShardingAuditorStrategyConfigurationEvent;
import org.apache.shardingsphere.sharding.event.strategy.audit.AlterShardingAuditorStrategyConfigurationEvent;
import org.apache.shardingsphere.sharding.event.strategy.audit.DeleteShardingAuditorStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.database.AddDatabaseShardingStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.database.AlterDatabaseShardingStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.database.DeleteDatabaseShardingStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.keygenerate.AddKeyGenerateStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.keygenerate.AlterKeyGenerateStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.keygenerate.DeleteKeyGenerateStrategyConfigurationEvent;
+import org.apache.shardingsphere.sharding.event.strategy.database.AddDefaultDatabaseShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.database.AlterDefaultDatabaseShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.database.DeleteDefaultDatabaseShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.keygenerate.AddDefaultKeyGenerateStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.keygenerate.AlterDefaultKeyGenerateStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.keygenerate.DeleteDefaultKeyGenerateStrategyEvent;
import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.AddDefaultShardingColumnEvent;
import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.AlterDefaultShardingColumnEvent;
import org.apache.shardingsphere.sharding.event.strategy.shardingcolumn.DeleteDefaultShardingColumnEvent;
-import org.apache.shardingsphere.sharding.event.strategy.table.AddTableShardingStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.table.AlterTableShardingStrategyConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.strategy.table.DeleteTableShardingStrategyConfigurationEvent;
+import org.apache.shardingsphere.sharding.event.strategy.table.AddDefaultTableShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.table.AlterDefaultTableShardingStrategyEvent;
+import org.apache.shardingsphere.sharding.event.strategy.table.DeleteDefaultTableShardingStrategyEvent;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.yaml.config.strategy.audit.YamlShardingAuditStrategyConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.strategy.keygen.YamlKeyGenerateStrategyConfiguration;
@@ -68,7 +68,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event add default database sharding strategy configuration event
*/
@Subscribe
- public synchronized void renew(final AddDatabaseShardingStrategyConfigurationEvent event) {
+ public synchronized void renew(final AddDefaultDatabaseShardingStrategyEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -86,7 +86,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event add default table sharding strategy configuration event
*/
@Subscribe
- public synchronized void renew(final AddTableShardingStrategyConfigurationEvent event) {
+ public synchronized void renew(final AddDefaultTableShardingStrategyEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -104,7 +104,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event add default key generate strategy configuration event
*/
@Subscribe
- public synchronized void renew(final AddKeyGenerateStrategyConfigurationEvent event) {
+ public synchronized void renew(final AddDefaultKeyGenerateStrategyEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -157,7 +157,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event alter default database sharding strategy configuration event
*/
@Subscribe
- public synchronized void renew(final AlterDatabaseShardingStrategyConfigurationEvent event) {
+ public synchronized void renew(final AlterDefaultDatabaseShardingStrategyEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -175,7 +175,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event alter default table sharding strategy configuration event
*/
@Subscribe
- public synchronized void renew(final AlterTableShardingStrategyConfigurationEvent event) {
+ public synchronized void renew(final AlterDefaultTableShardingStrategyEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -193,7 +193,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event alter default key generate strategy configuration event
*/
@Subscribe
- public synchronized void renew(final AlterKeyGenerateStrategyConfigurationEvent event) {
+ public synchronized void renew(final AlterDefaultKeyGenerateStrategyEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -246,7 +246,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event delete default database sharding strategy configuration event
*/
@Subscribe
- public synchronized void renew(final DeleteDatabaseShardingStrategyConfigurationEvent event) {
+ public synchronized void renew(final DeleteDefaultDatabaseShardingStrategyEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
@@ -262,7 +262,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event delete default table sharding strategy configuration event
*/
@Subscribe
- public synchronized void renew(final DeleteTableShardingStrategyConfigurationEvent event) {
+ public synchronized void renew(final DeleteDefaultTableShardingStrategyEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
@@ -278,7 +278,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
* @param event delete default key generate strategy configuration event
*/
@Subscribe
- public synchronized void renew(final DeleteKeyGenerateStrategyConfigurationEvent event) {
+ public synchronized void renew(final DeleteDefaultKeyGenerateStrategyEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
index ae2ef7d418a..8ba07b46bc8 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
@@ -28,15 +28,15 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
-import org.apache.shardingsphere.sharding.event.table.auto.AddShardingAutoTableConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.auto.AlterShardingAutoTableConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.auto.DeleteShardingAutoTableConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.binding.AddShardingTableReferenceConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.binding.AlterShardingTableReferenceConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.binding.DeleteShardingTableReferenceConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.sharding.AddShardingTableConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.sharding.AlterShardingTableConfigurationEvent;
-import org.apache.shardingsphere.sharding.event.table.sharding.DeleteShardingTableConfigurationEvent;
+import org.apache.shardingsphere.sharding.event.table.auto.AddShardingAutoTableEvent;
+import org.apache.shardingsphere.sharding.event.table.auto.AlterShardingAutoTableEvent;
+import org.apache.shardingsphere.sharding.event.table.auto.DeleteShardingAutoTableEvent;
+import org.apache.shardingsphere.sharding.event.table.binding.AddShardingTableReferenceEvent;
+import org.apache.shardingsphere.sharding.event.table.binding.AlterShardingTableReferenceEvent;
+import org.apache.shardingsphere.sharding.event.table.binding.DeleteShardingTableReferenceEvent;
+import org.apache.shardingsphere.sharding.event.table.sharding.AddShardingTableEvent;
+import org.apache.shardingsphere.sharding.event.table.sharding.AlterShardingTableEvent;
+import org.apache.shardingsphere.sharding.event.table.sharding.DeleteShardingTableEvent;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.yaml.config.rule.YamlShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.rule.YamlTableRuleConfiguration;
@@ -61,7 +61,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event add sharding table configuration event
*/
@Subscribe
- public synchronized void renew(final AddShardingTableConfigurationEvent event) {
+ public synchronized void renew(final AddShardingTableEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -81,7 +81,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event add sharding auto table configuration event
*/
@Subscribe
- public synchronized void renew(final AddShardingAutoTableConfigurationEvent event) {
+ public synchronized void renew(final AddShardingAutoTableEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -101,7 +101,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event add sharding auto table configuration event
*/
@Subscribe
- public synchronized void renew(final AddShardingTableReferenceConfigurationEvent event) {
+ public synchronized void renew(final AddShardingTableReferenceEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -121,7 +121,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event alter sharding table configuration event
*/
@Subscribe
- public synchronized void renew(final AlterShardingTableConfigurationEvent event) {
+ public synchronized void renew(final AlterShardingTableEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -140,7 +140,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event alter sharding auto table configuration event
*/
@Subscribe
- public synchronized void renew(final AlterShardingAutoTableConfigurationEvent event) {
+ public synchronized void renew(final AlterShardingAutoTableEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -159,7 +159,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event alter sharding table reference configuration event
*/
@Subscribe
- public synchronized void renew(final AlterShardingTableReferenceConfigurationEvent event) {
+ public synchronized void renew(final AlterShardingTableReferenceEvent event) {
if (!event.getActiveVersion().equals(contextManager.getInstanceContext().getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
@@ -178,7 +178,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event delete sharding table configuration event
*/
@Subscribe
- public synchronized void renew(final DeleteShardingTableConfigurationEvent event) {
+ public synchronized void renew(final DeleteShardingTableEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
@@ -194,7 +194,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event delete sharding auto table configuration event
*/
@Subscribe
- public synchronized void renew(final DeleteShardingAutoTableConfigurationEvent event) {
+ public synchronized void renew(final DeleteShardingAutoTableEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
@@ -210,7 +210,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
* @param event delete sharding table reference configuration event
*/
@Subscribe
- public synchronized void renew(final DeleteShardingTableReferenceConfigurationEvent event) {
+ public synchronized void renew(final DeleteShardingTableReferenceEvent event) {
if (!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName())) {
return;
}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
index c985787e249..6913d98bfab 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
@@ -50,7 +50,6 @@ import javax.sql.DataSource;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -113,7 +112,7 @@ class ExportStorageNodesExecutorTest {
}
@Test
- void assertExecute() throws SQLException {
+ void assertExecute() {
when(database.getName()).thenReturn("normal_db");
when(database.getResourceMetaData().getDataSources()).thenReturn(createDataSourceMap());
when(database.getRuleMetaData().getConfigurations()).thenReturn(Collections.singleton(createShardingRuleConfiguration()));