Skip to content

Commit fe3d345

Browse files
beiwei30CrazyHZM
beiwei30
authored and
CrazyHZM
committedMay 12, 2019
[DUBBO-3137]: step3 - start using CommonConstants (apache#4030)
* [DUBBO-3137]: start to use org.apache.dubbo.common.constants.CommonConstants * remove useless imports * remove useless imports * remove unused imports * remove unused imports * remove unused imports * remove unused imports * remove unused imports * use static import
·
dubbo-2.7.4dubbo-2.7.2
1 parent 6a3f4c7 commit fe3d345

File tree

199 files changed

+1500
-1089
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+1500
-1089
lines changed
 

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import java.util.Map;
2929
import java.util.Optional;
3030

31+
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_KEY;
32+
3133
/**
3234
* Configurator. (SPI, Prototype, ThreadSafe)
3335
*
@@ -82,7 +84,7 @@ static Optional<List<Configurator>> toConfigurators(List<URL> urls) {
8284
}
8385
Map<String, String> override = new HashMap<>(url.getParameters());
8486
//The anyhost parameter of override may be added automatically, it can't change the judgement of changing url
85-
override.remove(Constants.ANYHOST_KEY);
87+
override.remove(ANYHOST_KEY);
8688
if (override.size() == 0) {
8789
configurators.clear();
8890
continue;

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java

+30-20
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@
2727
import java.util.Map;
2828
import java.util.Set;
2929

30+
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_VALUE;
31+
import static org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE;
32+
import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
33+
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
34+
import static org.apache.dubbo.common.constants.CommonConstants.ENABLED_KEY;
35+
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
36+
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
37+
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
38+
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
39+
3040
/**
3141
* AbstractOverrideConfigurator
3242
*/
@@ -49,19 +59,19 @@ public URL getUrl() {
4959
@Override
5060
public URL configure(URL url) {
5161
// If override url is not enabled or is invalid, just return.
52-
if (!configuratorUrl.getParameter(Constants.ENABLED_KEY, true) || configuratorUrl.getHost() == null || url == null || url.getHost() == null) {
62+
if (!configuratorUrl.getParameter(ENABLED_KEY, true) || configuratorUrl.getHost() == null || url == null || url.getHost() == null) {
5363
return url;
5464
}
5565
/**
5666
* This if branch is created since 2.7.0.
5767
*/
5868
String apiVersion = configuratorUrl.getParameter(Constants.CONFIG_VERSION_KEY);
5969
if (StringUtils.isNotEmpty(apiVersion)) {
60-
String currentSide = url.getParameter(Constants.SIDE_KEY);
61-
String configuratorSide = configuratorUrl.getParameter(Constants.SIDE_KEY);
62-
if (currentSide.equals(configuratorSide) && Constants.CONSUMER.equals(configuratorSide) && 0 == configuratorUrl.getPort()) {
70+
String currentSide = url.getParameter(SIDE_KEY);
71+
String configuratorSide = configuratorUrl.getParameter(SIDE_KEY);
72+
if (currentSide.equals(configuratorSide) && CONSUMER.equals(configuratorSide) && 0 == configuratorUrl.getPort()) {
6373
url = configureIfMatch(NetUtils.getLocalHost(), url);
64-
} else if (currentSide.equals(configuratorSide) && Constants.PROVIDER.equals(configuratorSide) && url.getPort() == configuratorUrl.getPort()) {
74+
} else if (currentSide.equals(configuratorSide) && PROVIDER.equals(configuratorSide) && url.getPort() == configuratorUrl.getPort()) {
6575
url = configureIfMatch(url.getHost(), url);
6676
}
6777
}
@@ -84,41 +94,41 @@ private URL configureDeprecated(URL url) {
8494
} else {// override url don't have a port, means the ip override url specify is a consumer address or 0.0.0.0
8595
// 1.If it is a consumer ip address, the intention is to control a specific consumer instance, it must takes effect at the consumer side, any provider received this override url should ignore;
8696
// 2.If the ip is 0.0.0.0, this override url can be used on consumer, and also can be used on provider
87-
if (url.getParameter(Constants.SIDE_KEY, Constants.PROVIDER).equals(Constants.CONSUMER)) {
97+
if (url.getParameter(SIDE_KEY, PROVIDER).equals(CONSUMER)) {
8898
return configureIfMatch(NetUtils.getLocalHost(), url);// NetUtils.getLocalHost is the ip address consumer registered to registry.
89-
} else if (url.getParameter(Constants.SIDE_KEY, Constants.CONSUMER).equals(Constants.PROVIDER)) {
90-
return configureIfMatch(Constants.ANYHOST_VALUE, url);// take effect on all providers, so address must be 0.0.0.0, otherwise it won't flow to this if branch
99+
} else if (url.getParameter(SIDE_KEY, CONSUMER).equals(PROVIDER)) {
100+
return configureIfMatch(ANYHOST_VALUE, url);// take effect on all providers, so address must be 0.0.0.0, otherwise it won't flow to this if branch
91101
}
92102
}
93103
return url;
94104
}
95105

96106
private URL configureIfMatch(String host, URL url) {
97-
if (Constants.ANYHOST_VALUE.equals(configuratorUrl.getHost()) || host.equals(configuratorUrl.getHost())) {
107+
if (ANYHOST_VALUE.equals(configuratorUrl.getHost()) || host.equals(configuratorUrl.getHost())) {
98108
// TODO, to support wildcards
99109
String providers = configuratorUrl.getParameter(Constants.OVERRIDE_PROVIDERS_KEY);
100-
if (StringUtils.isEmpty(providers) || providers.contains(url.getAddress()) || providers.contains(Constants.ANYHOST_VALUE)) {
101-
String configApplication = configuratorUrl.getParameter(Constants.APPLICATION_KEY,
110+
if (StringUtils.isEmpty(providers) || providers.contains(url.getAddress()) || providers.contains(ANYHOST_VALUE)) {
111+
String configApplication = configuratorUrl.getParameter(APPLICATION_KEY,
102112
configuratorUrl.getUsername());
103-
String currentApplication = url.getParameter(Constants.APPLICATION_KEY, url.getUsername());
104-
if (configApplication == null || Constants.ANY_VALUE.equals(configApplication)
113+
String currentApplication = url.getParameter(APPLICATION_KEY, url.getUsername());
114+
if (configApplication == null || ANY_VALUE.equals(configApplication)
105115
|| configApplication.equals(currentApplication)) {
106116
Set<String> conditionKeys = new HashSet<String>();
107117
conditionKeys.add(Constants.CATEGORY_KEY);
108118
conditionKeys.add(RemotingConstants.CHECK_KEY);
109119
conditionKeys.add(Constants.DYNAMIC_KEY);
110-
conditionKeys.add(Constants.ENABLED_KEY);
111-
conditionKeys.add(Constants.GROUP_KEY);
112-
conditionKeys.add(Constants.VERSION_KEY);
113-
conditionKeys.add(Constants.APPLICATION_KEY);
114-
conditionKeys.add(Constants.SIDE_KEY);
120+
conditionKeys.add(ENABLED_KEY);
121+
conditionKeys.add(GROUP_KEY);
122+
conditionKeys.add(VERSION_KEY);
123+
conditionKeys.add(APPLICATION_KEY);
124+
conditionKeys.add(SIDE_KEY);
115125
conditionKeys.add(Constants.CONFIG_VERSION_KEY);
116126
for (Map.Entry<String, String> entry : configuratorUrl.getParameters().entrySet()) {
117127
String key = entry.getKey();
118128
String value = entry.getValue();
119-
if (key.startsWith("~") || Constants.APPLICATION_KEY.equals(key) || Constants.SIDE_KEY.equals(key)) {
129+
if (key.startsWith("~") || APPLICATION_KEY.equals(key) || SIDE_KEY.equals(key)) {
120130
conditionKeys.add(key);
121-
if (value != null && !Constants.ANY_VALUE.equals(value)
131+
if (value != null && !ANY_VALUE.equals(value)
122132
&& !value.equals(url.getParameter(key.startsWith("~") ? key.substring(1) : key))) {
123133
return url;
124134
}

0 commit comments

Comments
 (0)
Please sign in to comment.