This is an automated email from the ASF dual-hosted git repository.
kimmking pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 2843eaf Optimize code for base practice for 3.x (#9830)
2843eaf is described below
commit 2843eaf0e7059b55cc197a8dc826b1a18f869f4e
Author: DaneBrown <[email protected]>
AuthorDate: Wed Mar 23 23:24:59 2022 +0800
Optimize code for base practice for 3.x (#9830)
* Optimize code for base practice
* Optimize code for base practice
* Optimize code for base practice
* add blank between param and value
---
.../configurator/parser/model/ConfigItem.java | 25 ++++++++++++++--------
.../parser/model/ConfiguratorConfig.java | 16 ++++++++------
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java
index c5b1263..9f9aadc 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java
@@ -28,6 +28,14 @@ public class ConfigItem {
public static final String WEIGHT_TYPE = "weight";
public static final String BALANCING_TYPE = "balancing";
public static final String DISABLED_TYPE = "disabled";
+ public static final String CONFIG_ITEM_TYPE = "type";
+ public static final String ENABLED_KEY = "enabled";
+ public static final String ADDRESSES_KEY = "addresses";
+ public static final String PROVIDER_ADDRESSES_KEY = "providerAddresses";
+ public static final String SERVICES_KEY = "services";
+ public static final String APPLICATIONS_KEY = "applications";
+ public static final String PARAMETERS_KEY = "parameters";
+ public static final String SIDE_KEY = "side";
private String type;
private Boolean enabled;
@@ -41,44 +49,43 @@ public class ConfigItem {
@SuppressWarnings("unchecked")
public static ConfigItem parseFromMap(Map<String, Object> map) {
ConfigItem configItem = new ConfigItem();
- configItem.setType((String) map.get("type"));
+ configItem.setType((String) map.get(CONFIG_ITEM_TYPE));
- Object enabled = map.get("enabled");
+ Object enabled = map.get(ENABLED_KEY);
if (enabled != null) {
configItem.setEnabled(Boolean.parseBoolean(enabled.toString()));
}
- Object addresses = map.get("addresses");
+ Object addresses = map.get(ADDRESSES_KEY);
if (addresses != null &&
List.class.isAssignableFrom(addresses.getClass())) {
configItem.setAddresses(((List<Object>) addresses).stream()
.map(String::valueOf).collect(Collectors.toList()));
}
- Object providerAddresses = map.get("providerAddresses");
+ Object providerAddresses = map.get(PROVIDER_ADDRESSES_KEY);
if (providerAddresses != null &&
List.class.isAssignableFrom(providerAddresses.getClass())) {
configItem.setProviderAddresses(((List<Object>)
providerAddresses).stream()
.map(String::valueOf).collect(Collectors.toList()));
}
- Object services = map.get("services");
+ Object services = map.get(SERVICES_KEY);
if (services != null &&
List.class.isAssignableFrom(services.getClass())) {
configItem.setServices(((List<Object>) services).stream()
.map(String::valueOf).collect(Collectors.toList()));
}
- Object applications = map.get("applications");
+ Object applications = map.get(APPLICATIONS_KEY);
if (applications != null &&
List.class.isAssignableFrom(applications.getClass())) {
configItem.setApplications(((List<Object>) applications).stream()
.map(String::valueOf).collect(Collectors.toList()));
}
- Object parameters = map.get("parameters");
+ Object parameters = map.get(PARAMETERS_KEY);
if (parameters != null &&
Map.class.isAssignableFrom(parameters.getClass())) {
configItem.setParameters(((Map<String, Object>)
parameters).entrySet()
.stream().collect(Collectors.toMap(Map.Entry::getKey,
entry -> entry.getValue().toString())));
}
-
- configItem.setSide((String) map.get("side"));
+ configItem.setSide((String) map.get(SIDE_KEY));
return configItem;
}
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java
index 91a4863..d944074 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java
@@ -26,7 +26,11 @@ import java.util.stream.Collectors;
public class ConfiguratorConfig {
public static final String SCOPE_SERVICE = "service";
public static final String SCOPE_APPLICATION = "application";
-
+ public static final String CONFIG_VERSION_KEY = "configVersion";
+ public static final String SCOPE_KEY = "scope";
+ public static final String CONFIG_KEY = "key";
+ public static final String ENABLED_KEY = "enabled";
+ public static final String CONFIGS_KEY = "configs";
private String configVersion;
private String scope;
private String key;
@@ -36,16 +40,16 @@ public class ConfiguratorConfig {
@SuppressWarnings("unchecked")
public static ConfiguratorConfig parseFromMap(Map<String, Object> map) {
ConfiguratorConfig configuratorConfig = new ConfiguratorConfig();
- configuratorConfig.setConfigVersion((String) map.get("configVersion"));
- configuratorConfig.setScope((String) map.get("scope"));
- configuratorConfig.setKey((String) map.get("key"));
+ configuratorConfig.setConfigVersion((String)
map.get(CONFIG_VERSION_KEY));
+ configuratorConfig.setScope((String) map.get(SCOPE_KEY));
+ configuratorConfig.setKey((String) map.get(CONFIG_KEY));
- Object enabled = map.get("enabled");
+ Object enabled = map.get(ENABLED_KEY);
if (enabled != null) {
configuratorConfig.setEnabled(Boolean.parseBoolean(enabled.toString()));
}
- Object configs = map.get("configs");
+ Object configs = map.get(CONFIGS_KEY);
if (configs != null &&
List.class.isAssignableFrom(configs.getClass())) {
configuratorConfig.setConfigs(((List<Map<String, Object>>)
configs).stream()
.map(ConfigItem::parseFromMap).collect(Collectors.toList()));
