Move ReadwriteSplittingQualifiedDataSourceDeletedSubscriber

apache · Dec 13, 2024 · a44edbd · a44edbd
1 parent 93965c6
commit a44edbd
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/...ttingQualifiedDataSourceDeletedEvent.java → ...ttingQualifiedDataSourceDeletedEvent.java b/...ttingQualifiedDataSourceDeletedEvent.java → ...ttingQualifiedDataSourceDeletedEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.readwritesplitting.subscriber;
+package org.apache.shardingsphere.readwritesplitting.cluster;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/...QualifiedDataSourceDeletedSubscriber.java → ...QualifiedDataSourceDeletedSubscriber.java b/...QualifiedDataSourceDeletedSubscriber.java → ...QualifiedDataSourceDeletedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.readwritesplitting.subscriber;
+package org.apache.shardingsphere.readwritesplitting.cluster;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;

diff --git a/...edDataSourceDeletedSubscriberFactory.java → ...edDataSourceDeletedSubscriberFactory.java b/...edDataSourceDeletedSubscriberFactory.java → ...edDataSourceDeletedSubscriberFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.readwritesplitting.subscriber;
+package org.apache.shardingsphere.readwritesplitting.cluster;
 
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
 import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;

diff --git a/...re/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java b/...re/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
@@ -23,7 +23,7 @@
 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.readwritesplitting.subscriber.ReadwriteSplittingQualifiedDataSourceDeletedEvent;
+import org.apache.shardingsphere.readwritesplitting.cluster.ReadwriteSplittingQualifiedDataSourceDeletedEvent;
 import org.apache.shardingsphere.readwritesplitting.exception.logic.ReadwriteSplittingDataSourceRuleNotFoundException;
 import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceGroupRule;
 
@@ -68,8 +68,7 @@ public void cleanStorageNodeDataSources() {
     }
 
     private void deleteStorageNodeDataSources(final ReadwriteSplittingDataSourceGroupRule rule) {
-        rule.getReadwriteSplittingGroup().getReadDataSources()
-                .forEach(each -> computeNodeInstanceContext.getEventBusContext()
-                        .post(new ReadwriteSplittingQualifiedDataSourceDeletedEvent(new QualifiedDataSource(databaseName, rule.getName(), each))));
+        rule.getReadwriteSplittingGroup().getReadDataSources().forEach(each -> computeNodeInstanceContext.getEventBusContext()
+                .post(new ReadwriteSplittingQualifiedDataSourceDeletedEvent(new QualifiedDataSource(databaseName, rule.getName(), each))));
     }
 }
diff --git a/...A-INF/services/org.apache.shardingsphere.mode.event.deliver.DeliverEventSubscriberFactory b/...A-INF/services/org.apache.shardingsphere.mode.event.deliver.DeliverEventSubscriberFactory
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.readwritesplitting.subscriber.ReadwriteSplittingQualifiedDataSourceDeletedSubscriberFactory
+org.apache.shardingsphere.readwritesplitting.cluster.ReadwriteSplittingQualifiedDataSourceDeletedSubscriberFactory
diff --git a/...ifiedDataSourceDeletedSubscriberTest.java → ...ifiedDataSourceDeletedSubscriberTest.java b/...ifiedDataSourceDeletedSubscriberTest.java → ...ifiedDataSourceDeletedSubscriberTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.readwritesplitting.subscriber;
+package org.apache.shardingsphere.readwritesplitting.cluster;
 
 import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
 import org.apache.shardingsphere.mode.spi.PersistRepository;

diff --git a/...eadwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttributeTest.java b/...eadwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttributeTest.java
@@ -20,7 +20,7 @@
 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.readwritesplitting.subscriber.ReadwriteSplittingQualifiedDataSourceDeletedEvent;
+import org.apache.shardingsphere.readwritesplitting.cluster.ReadwriteSplittingQualifiedDataSourceDeletedEvent;
 import org.apache.shardingsphere.readwritesplitting.exception.logic.ReadwriteSplittingDataSourceRuleNotFoundException;
 import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceGroupRule;
 import org.junit.jupiter.api.Test;