This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 44a5962 Fixes dependencies (#27)
44a5962 is described below
commit 44a59622b24f9b1fee01d364132c56805ce2e0e6
Author: Haoran Meng <[email protected]>
AuthorDate: Mon Nov 9 10:36:28 2020 +0800
Fixes dependencies (#27)
---
.../ui/servcie/impl/GovernanceServiceImpl.java | 24 +++++++++++-----------
.../ui/util/ConfigurationYamlConverter.java | 12 +++++------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java
b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java
index aa98978..27fb628 100644
---
a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java
+++
b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.ui.servcie.impl;
import com.google.common.base.Joiner;
import
org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import
org.apache.shardingsphere.replication.primaryreplica.api.config.PrimaryReplicaReplicationRuleConfiguration;
-import
org.apache.shardingsphere.replication.primaryreplica.api.config.rule.PrimaryReplicaReplicationDataSourceRuleConfiguration;
+import
org.apache.shardingsphere.replicaquery.api.config.ReplicaQueryRuleConfiguration;
+import
org.apache.shardingsphere.replicaquery.api.config.rule.ReplicaQueryDataSourceRuleConfiguration;
import org.apache.shardingsphere.ui.common.dto.InstanceDTO;
import org.apache.shardingsphere.ui.common.dto.ReplicaDataSourceDTO;
import org.apache.shardingsphere.ui.servcie.GovernanceService;
@@ -73,7 +73,7 @@ public final class GovernanceServiceImpl implements
GovernanceService {
String configData =
shardingSchemaService.getRuleConfiguration(schemaName);
if (configData.contains("!SHARDING")) {
handleShardingRuleConfiguration(result, configData,
schemaName);
- } else if (configData.contains("!PRIMARY_REPLICA_REPLICATION")) {
+ } else if (configData.contains("!REPLICA_QUERY")) {
handleMasterSlaveRuleConfiguration(result, configData,
schemaName);
}
}
@@ -93,26 +93,26 @@ public final class GovernanceServiceImpl implements
GovernanceService {
private void handleShardingRuleConfiguration(final
Collection<ReplicaDataSourceDTO> replicaDataSourceDTOS, final String
configData, final String schemaName) {
Collection<RuleConfiguration> configurations =
ConfigurationYamlConverter.loadRuleConfigurations(configData);
- Collection<PrimaryReplicaReplicationRuleConfiguration>
primaryReplicaReplicationRuleConfigs = configurations.stream().filter(
- config -> config instanceof
PrimaryReplicaReplicationRuleConfiguration).map(config ->
(PrimaryReplicaReplicationRuleConfiguration)
config).collect(Collectors.toList());
- for (PrimaryReplicaReplicationRuleConfiguration
primaryReplicaReplicationRuleConfiguration :
primaryReplicaReplicationRuleConfigs) {
- addSlaveDataSource(replicaDataSourceDTOS,
primaryReplicaReplicationRuleConfiguration, schemaName);
+ Collection<ReplicaQueryRuleConfiguration>
replicaQueryRuleConfigurations = configurations.stream().filter(
+ config -> config instanceof
ReplicaQueryRuleConfiguration).map(config -> (ReplicaQueryRuleConfiguration)
config).collect(Collectors.toList());
+ for (ReplicaQueryRuleConfiguration replicaQueryRuleConfiguration :
replicaQueryRuleConfigurations) {
+ addSlaveDataSource(replicaDataSourceDTOS,
replicaQueryRuleConfiguration, schemaName);
}
}
private void handleMasterSlaveRuleConfiguration(final
Collection<ReplicaDataSourceDTO> replicaDataSourceDTOS, final String
configData, final String schemaName) {
- PrimaryReplicaReplicationRuleConfiguration
primaryReplicaReplicationRuleConfiguration =
ConfigurationYamlConverter.loadPrimaryReplicaRuleConfiguration(configData);
- addSlaveDataSource(replicaDataSourceDTOS,
primaryReplicaReplicationRuleConfiguration, schemaName);
+ ReplicaQueryRuleConfiguration replicaQueryRuleConfiguration =
ConfigurationYamlConverter.loadPrimaryReplicaRuleConfiguration(configData);
+ addSlaveDataSource(replicaDataSourceDTOS,
replicaQueryRuleConfiguration, schemaName);
}
- private void addSlaveDataSource(final Collection<ReplicaDataSourceDTO>
replicaDataSourceDTOS, final PrimaryReplicaReplicationRuleConfiguration
primaryReplicaReplicationRuleConfiguration, final String schemaName) {
+ private void addSlaveDataSource(final Collection<ReplicaDataSourceDTO>
replicaDataSourceDTOS, final ReplicaQueryRuleConfiguration
replicaQueryRuleConfiguration, final String schemaName) {
Collection<String> disabledSchemaDataSourceNames =
getDisabledSchemaDataSourceNames();
- for (PrimaryReplicaReplicationDataSourceRuleConfiguration each :
primaryReplicaReplicationRuleConfiguration.getDataSources()) {
+ for (ReplicaQueryDataSourceRuleConfiguration each :
replicaQueryRuleConfiguration.getDataSources()) {
replicaDataSourceDTOS.addAll(getReplicaDataSourceDTOS(schemaName,
disabledSchemaDataSourceNames, each));
}
}
- private Collection<ReplicaDataSourceDTO> getReplicaDataSourceDTOS(final
String schemaName, final Collection<String> disabledSchemaDataSourceNames,
final PrimaryReplicaReplicationDataSourceRuleConfiguration group) {
+ private Collection<ReplicaDataSourceDTO> getReplicaDataSourceDTOS(final
String schemaName, final Collection<String> disabledSchemaDataSourceNames,
final ReplicaQueryDataSourceRuleConfiguration group) {
Collection<ReplicaDataSourceDTO> result = new LinkedList<>();
for (String each : group.getReplicaDataSourceNames()) {
result.add(new ReplicaDataSourceDTO(schemaName,
group.getPrimaryDataSourceName(), each,
!disabledSchemaDataSourceNames.contains(schemaName + "." + each)));
diff --git
a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/ConfigurationYamlConverter.java
b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/ConfigurationYamlConverter.java
index 24f79de..f8de507 100644
---
a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/ConfigurationYamlConverter.java
+++
b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/ConfigurationYamlConverter.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
-import
org.apache.shardingsphere.replication.primaryreplica.api.config.PrimaryReplicaReplicationRuleConfiguration;
+import
org.apache.shardingsphere.replicaquery.api.config.ReplicaQueryRuleConfiguration;
import java.util.Collection;
import java.util.Map;
@@ -68,15 +68,15 @@ public final class ConfigurationYamlConverter {
}
/**
- * Load primary replica rule configuration.
+ * Load replica query rule configuration.
*
* @param data data
- * @return primary replica rule configuration
+ * @return replica query rule configuration
*/
- public static PrimaryReplicaReplicationRuleConfiguration
loadPrimaryReplicaRuleConfiguration(final String data) {
+ public static ReplicaQueryRuleConfiguration
loadPrimaryReplicaRuleConfiguration(final String data) {
Collection<RuleConfiguration> ruleConfigurations =
loadRuleConfigurations(data);
- Optional<PrimaryReplicaReplicationRuleConfiguration> result =
ruleConfigurations.stream().filter(
- each -> each instanceof
PrimaryReplicaReplicationRuleConfiguration).map(ruleConfiguration ->
(PrimaryReplicaReplicationRuleConfiguration) ruleConfiguration).findFirst();
+ Optional<ReplicaQueryRuleConfiguration> result =
ruleConfigurations.stream().filter(
+ each -> each instanceof
ReplicaQueryRuleConfiguration).map(ruleConfiguration ->
(ReplicaQueryRuleConfiguration) ruleConfiguration).findFirst();
Preconditions.checkState(result.isPresent());
return result.get();
}
