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 8058fe4daee Rename YamlQualifiedDataSourceStatus to
YamlQualifiedDataSourceState (#31716)
8058fe4daee is described below
commit 8058fe4daee6560d013c78da96d0e3ffe73f514a
Author: Haoran Meng <[email protected]>
AuthorDate: Mon Jun 17 11:17:51 2024 +0800
Rename YamlQualifiedDataSourceStatus to YamlQualifiedDataSourceState
(#31716)
---
.../persist/QualifiedDataSourceStatePersistService.java | 8 ++++----
...DataSourceStatus.java => YamlQualifiedDataSourceState.java} | 4 ++--
...usSwapper.java => YamlQualifiedDataSourceStateSwapper.java} | 10 +++++-----
.../nodes/storage/watcher/QualifiedDataSourceWatcher.java | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
index c87370660d8..92e9275c361 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStatus;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStatusSwapper;
+import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceState;
+import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStateSwapper;
import java.util.Collection;
import java.util.HashMap;
@@ -51,7 +51,7 @@ public final class QualifiedDataSourceStatePersistService {
qualifiedDataSourceNodes.forEach(each -> {
String yamlContent =
repository.query(QualifiedDataSourceNode.getQualifiedDataSourceNodePath(new
QualifiedDataSource(each)));
if (!Strings.isNullOrEmpty(yamlContent)) {
- result.put(each, new
YamlQualifiedDataSourceStatusSwapper().swapToObject(YamlEngine.unmarshal(yamlContent,
YamlQualifiedDataSourceStatus.class)));
+ result.put(each, new
YamlQualifiedDataSourceStateSwapper().swapToObject(YamlEngine.unmarshal(yamlContent,
YamlQualifiedDataSourceState.class)));
}
});
return result;
@@ -68,6 +68,6 @@ public final class QualifiedDataSourceStatePersistService {
public void updateState(final String databaseName, final String groupName,
final String storageUnitName, final DataSourceState dataSourceState) {
QualifiedDataSourceState status = new
QualifiedDataSourceState(dataSourceState);
repository.persist(QualifiedDataSourceNode.getQualifiedDataSourceNodePath(
- new QualifiedDataSource(databaseName, groupName,
storageUnitName)), YamlEngine.marshal(new
YamlQualifiedDataSourceStatusSwapper().swapToYamlConfiguration(status)));
+ new QualifiedDataSource(databaseName, groupName,
storageUnitName)), YamlEngine.marshal(new
YamlQualifiedDataSourceStateSwapper().swapToYamlConfiguration(status)));
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStatus.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceState.java
similarity index 89%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStatus.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceState.java
index 0bc4c920164..6b5d4ebf139 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStatus.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceState.java
@@ -22,11 +22,11 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
/**
- * YAML qualified data source status.
+ * YAML qualified data source state.
*/
@Getter
@Setter
-public final class YamlQualifiedDataSourceStatus implements YamlConfiguration {
+public final class YamlQualifiedDataSourceState implements YamlConfiguration {
private String status;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStatusSwapper.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStateSwapper.java
similarity index 76%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStatusSwapper.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStateSwapper.java
index 7a99ad42671..c789b268764 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStatusSwapper.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStateSwapper.java
@@ -22,19 +22,19 @@ import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwappe
import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
/**
- * YAML qualified data source status swapper.
+ * YAML qualified data source state swapper.
*/
-public final class YamlQualifiedDataSourceStatusSwapper implements
YamlConfigurationSwapper<YamlQualifiedDataSourceStatus,
QualifiedDataSourceState> {
+public final class YamlQualifiedDataSourceStateSwapper implements
YamlConfigurationSwapper<YamlQualifiedDataSourceState,
QualifiedDataSourceState> {
@Override
- public YamlQualifiedDataSourceStatus swapToYamlConfiguration(final
QualifiedDataSourceState data) {
- YamlQualifiedDataSourceStatus result = new
YamlQualifiedDataSourceStatus();
+ public YamlQualifiedDataSourceState swapToYamlConfiguration(final
QualifiedDataSourceState data) {
+ YamlQualifiedDataSourceState result = new
YamlQualifiedDataSourceState();
result.setStatus(data.getState().name());
return result;
}
@Override
- public QualifiedDataSourceState swapToObject(final
YamlQualifiedDataSourceStatus yamlConfig) {
+ public QualifiedDataSourceState swapToObject(final
YamlQualifiedDataSourceState yamlConfig) {
return new
QualifiedDataSourceState(DataSourceState.valueOf(yamlConfig.getStatus()));
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/watcher/QualifiedDataSourceWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/watcher/QualifiedDataSourceWatcher.java
index 9097c81cb0c..8950a667411 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/watcher/QualifiedDataSourceWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/watcher/QualifiedDataSourceWatcher.java
@@ -27,8 +27,8 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.QualifiedDataSourceStateEvent;
import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStatus;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStatusSwapper;
+import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceState;
+import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStateSwapper;
import java.util.Arrays;
import java.util.Collection;
@@ -57,7 +57,7 @@ public final class QualifiedDataSourceWatcher implements
GovernanceWatcher<Gover
}
Optional<QualifiedDataSource> qualifiedDataSource =
QualifiedDataSourceNode.extractQualifiedDataSource(event.getKey());
if (qualifiedDataSource.isPresent()) {
- QualifiedDataSourceState state = new
YamlQualifiedDataSourceStatusSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(),
YamlQualifiedDataSourceStatus.class));
+ QualifiedDataSourceState state = new
YamlQualifiedDataSourceStateSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(),
YamlQualifiedDataSourceState.class));
return Optional.of(new
QualifiedDataSourceStateEvent(qualifiedDataSource.get(), state));
}
return Optional.empty();
