This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e0fc3f34d38 Move DeliverEvent from mode-api to mode-core module
(#34065)
e0fc3f34d38 is described below
commit e0fc3f34d38e34127a493288bc704aa6d5a4c539
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Dec 15 11:48:49 2024 +0800
Move DeliverEvent from mode-api to mode-core module (#34065)
---
.../ReadwriteSplittingQualifiedDataSourceDeletedSubscriber.java | 2 +-
.../attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java | 2 +-
.../ReadwriteSplittingQualifiedDataSourceDeletedSubscriberTest.java | 2 +-
.../ReadwriteSplittingStaticDataSourceRuleAttributeTest.java | 2 +-
.../mode/event/deliver}/QualifiedDataSourceDeletedEvent.java | 2 +-
.../event/{ => dispatch}/builder/MetaDataChangedEventBuilder.java | 2 +-
.../{ => dispatch}/builder/RuleConfigurationChangedEventBuilder.java | 2 +-
.../mode/event/builder/MetaDataChangedEventBuilderTest.java | 1 +
.../mode/event/builder/RuleConfigurationChangedEventBuilderTest.java | 1 +
.../event/dispatch/listener/type/DatabaseMetaDataChangedListener.java | 4 ++--
.../persist/service/StandaloneMetaDataManagerPersistService.java | 2 +-
.../persist/service/StandaloneMetaDataManagerPersistServiceTest.java | 2 +-
12 files changed, 13 insertions(+), 11 deletions(-)
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriber.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriber.java
index 73d5936091a..70ffc7bc4a8 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriber.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriber.java
@@ -21,7 +21,7 @@ import com.google.common.eventbus.Subscribe;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
import org.apache.shardingsphere.metadata.persist.node.QualifiedDataSourceNode;
-import
org.apache.shardingsphere.mode.event.deliver.pojo.QualifiedDataSourceDeletedEvent;
+import
org.apache.shardingsphere.mode.event.deliver.QualifiedDataSourceDeletedEvent;
import org.apache.shardingsphere.mode.spi.PersistRepository;
/**
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
index c6254d814b7..da049991077 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
import
org.apache.shardingsphere.infra.rule.attribute.datasource.StaticDataSourceRuleAttribute;
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
-import
org.apache.shardingsphere.mode.event.deliver.pojo.QualifiedDataSourceDeletedEvent;
+import
org.apache.shardingsphere.mode.event.deliver.QualifiedDataSourceDeletedEvent;
import
org.apache.shardingsphere.readwritesplitting.exception.logic.ReadwriteSplittingDataSourceRuleNotFoundException;
import
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceGroupRule;
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriberTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriberTest.java
index 60cb412bd8c..f3994bd0aa4 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriberTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/cluster/ReadwriteSplittingQualifiedDataSourceDeletedSubscriberTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.cluster;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
-import
org.apache.shardingsphere.mode.event.deliver.pojo.QualifiedDataSourceDeletedEvent;
+import
org.apache.shardingsphere.mode.event.deliver.QualifiedDataSourceDeletedEvent;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttributeTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttributeTest.java
index 96f744e6b1c..be5f4405059 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttributeTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttributeTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.readwritesplitting.rule.attribute;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
-import
org.apache.shardingsphere.mode.event.deliver.pojo.QualifiedDataSourceDeletedEvent;
+import
org.apache.shardingsphere.mode.event.deliver.QualifiedDataSourceDeletedEvent;
import
org.apache.shardingsphere.readwritesplitting.exception.logic.ReadwriteSplittingDataSourceRuleNotFoundException;
import
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceGroupRule;
import org.junit.jupiter.api.Test;
diff --git
a/mode/api/src/main/java/org/apache/shardingsphere/mode/event/deliver/pojo/QualifiedDataSourceDeletedEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/deliver/QualifiedDataSourceDeletedEvent.java
similarity index 95%
rename from
mode/api/src/main/java/org/apache/shardingsphere/mode/event/deliver/pojo/QualifiedDataSourceDeletedEvent.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/deliver/QualifiedDataSourceDeletedEvent.java
index bab5b1395c2..90111b50305 100644
---
a/mode/api/src/main/java/org/apache/shardingsphere/mode/event/deliver/pojo/QualifiedDataSourceDeletedEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/deliver/QualifiedDataSourceDeletedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.deliver.pojo;
+package org.apache.shardingsphere.mode.event.deliver;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/builder/MetaDataChangedEventBuilder.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/dispatch/builder/MetaDataChangedEventBuilder.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/builder/MetaDataChangedEventBuilder.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/dispatch/builder/MetaDataChangedEventBuilder.java
index d8b5bed3288..d84f4a42eee 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/builder/MetaDataChangedEventBuilder.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/dispatch/builder/MetaDataChangedEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.builder;
+package org.apache.shardingsphere.mode.event.dispatch.builder;
import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
import
org.apache.shardingsphere.metadata.persist.node.metadata.DataSourceMetaDataNode;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/builder/RuleConfigurationChangedEventBuilder.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/dispatch/builder/RuleConfigurationChangedEventBuilder.java
similarity index 98%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/builder/RuleConfigurationChangedEventBuilder.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/dispatch/builder/RuleConfigurationChangedEventBuilder.java
index 9fe445fd099..11c39e6f454 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/builder/RuleConfigurationChangedEventBuilder.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/dispatch/builder/RuleConfigurationChangedEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.builder;
+package org.apache.shardingsphere.mode.event.dispatch.builder;
import com.google.common.base.Strings;
import org.apache.shardingsphere.mode.event.dispatch.DispatchEvent;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/MetaDataChangedEventBuilderTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/MetaDataChangedEventBuilderTest.java
index 60e9320caa9..1ebcafb3c2f 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/MetaDataChangedEventBuilderTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/MetaDataChangedEventBuilderTest.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.mode.event.builder;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.dispatch.DispatchEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.builder.MetaDataChangedEventBuilder;
import
org.apache.shardingsphere.mode.event.dispatch.datasource.node.StorageNodeAlteredEvent;
import
org.apache.shardingsphere.mode.event.dispatch.datasource.node.StorageNodeRegisteredEvent;
import
org.apache.shardingsphere.mode.event.dispatch.datasource.node.StorageNodeUnregisteredEvent;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/RuleConfigurationChangedEventBuilderTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/RuleConfigurationChangedEventBuilderTest.java
index 9d888833df2..b5a5035d1a7 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/RuleConfigurationChangedEventBuilderTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/event/builder/RuleConfigurationChangedEventBuilderTest.java
@@ -21,6 +21,7 @@ import
org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.event.dispatch.DispatchEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.builder.RuleConfigurationChangedEventBuilder;
import
org.apache.shardingsphere.mode.event.dispatch.rule.alter.AlterNamedRuleItemEvent;
import
org.apache.shardingsphere.mode.event.dispatch.rule.alter.AlterUniqueRuleItemEvent;
import
org.apache.shardingsphere.mode.event.dispatch.rule.drop.DropNamedRuleItemEvent;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/listener/type/DatabaseMetaDataChangedListener.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/listener/type/DatabaseMetaDataChangedListener.java
index 8d8d0f46f47..9fa7a4f77b3 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/listener/type/DatabaseMetaDataChangedListener.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/listener/type/DatabaseMetaDataChangedListener.java
@@ -21,8 +21,8 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
-import
org.apache.shardingsphere.mode.event.builder.MetaDataChangedEventBuilder;
-import
org.apache.shardingsphere.mode.event.builder.RuleConfigurationChangedEventBuilder;
+import
org.apache.shardingsphere.mode.event.dispatch.builder.MetaDataChangedEventBuilder;
+import
org.apache.shardingsphere.mode.event.dispatch.builder.RuleConfigurationChangedEventBuilder;
import org.apache.shardingsphere.mode.event.dispatch.DispatchEvent;
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index f5badd70606..ce64a55aaf5 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -36,7 +36,7 @@ import
org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.metadata.persist.service.config.database.DataSourceUnitPersistService;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import
org.apache.shardingsphere.mode.event.builder.RuleConfigurationChangedEventBuilder;
+import
org.apache.shardingsphere.mode.event.dispatch.builder.RuleConfigurationChangedEventBuilder;
import org.apache.shardingsphere.mode.event.dispatch.DispatchEvent;
import
org.apache.shardingsphere.mode.event.dispatch.rule.alter.AlterRuleItemEvent;
import
org.apache.shardingsphere.mode.event.dispatch.rule.drop.DropRuleItemEvent;
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index 7ba6f66770c..cfb6314040c 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchema
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.metadata.persist.service.metadata.DatabaseMetaDataPersistFacade;
-import
org.apache.shardingsphere.mode.event.builder.RuleConfigurationChangedEventBuilder;
+import
org.apache.shardingsphere.mode.event.dispatch.builder.RuleConfigurationChangedEventBuilder;
import
org.apache.shardingsphere.mode.event.dispatch.rule.alter.AlterRuleItemEvent;
import
org.apache.shardingsphere.mode.event.dispatch.rule.drop.DropRuleItemEvent;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
