Skip to content

Commit 562a126

Browse files
mercyblitzmercyblitz
authored
Merge pull request #15 from alibaba/master
Update
2 parents 5400dbf + e2d63ad commit 562a126

File tree

178 files changed

+3341
-376
lines changed

Some content is hidden

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

178 files changed

+3341
-376
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ jdk:
33
- oraclejdk8
44
- openjdk7
55

6-
script: mvn -DskipTests=true clean package
6+
script: mvn clean package

‎CONTRIBUTING.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
## Contributing to dubbo
3+
Dubbo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
4+
### Sign the Contributor License Agreement
5+
Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
6+
### Code Conventions
7+
Our code style is almost in line with the standard java conventions(Popular IDE's default setting satisfy this), only changed the following two restricts:
8+
1. Classes under 'com.alibaba.*' and 'com.taobao.*' package are grouped separately, and put on top of all other 'imports'.
9+
2. If there are more than 120 characters in current line, start a new line.
10+
11+
We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/alibaba/dubbo/tree/master/codestyle/dubbo_codestyle_for_idea.xml) for IntelliJ idea, you can import it to you IDE. If you use Eclipse you can config manually by referencing the same file.
12+
13+
* Make sure all new .java files to have a simple Javadoc class comment with at least an @author tag identifying you, and a @date tag identifying birth, and preferably at least a paragraph on what the class is for.
14+
15+
* Add the ASF license header comment to all new .java files (copy from existing files in the project)
16+
17+
* Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes).
18+
19+
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
20+
21+
* A few unit tests should be added for a new feature or an important bugfix.
22+
23+
* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project).
24+
25+
* When writing a commit message please follow these conventions, if you are fixing an existing issue please add Fixes #XXX at the end of the commit message (where XXX is the issue number).

‎dubbo-admin/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.alibaba</groupId>
2121
<artifactId>dubbo-parent</artifactId>
22-
<version>2.5.6</version>
22+
<version>2.5.7</version>
2323
</parent>
2424
<artifactId>dubbo-admin</artifactId>
2525
<packaging>war</packaging>
@@ -170,6 +170,10 @@
170170
<groupId>javax.cache</groupId>
171171
<artifactId>cache-api</artifactId>
172172
</dependency>
173+
<dependency>
174+
<groupId>org.apache.velocity</groupId>
175+
<artifactId>velocity</artifactId>
176+
</dependency>
173177
</dependencies>
174178
<build>
175179
<plugins>

‎dubbo-admin/src/main/java/com/alibaba/dubbo/governance/service/impl/OverrideServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void enableOverride(Long id) {
7575
return;
7676
}
7777

78-
URL newOverride = oldOverride.addParameter("enabled", "enabled");
78+
URL newOverride = oldOverride.addParameter("enabled", true);
7979
registryService.unregister(oldOverride);
8080
registryService.register(newOverride);
8181

‎dubbo-cluster/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.alibaba</groupId>
2121
<artifactId>dubbo-parent</artifactId>
22-
<version>2.5.6</version>
22+
<version>2.5.7</version>
2323
</parent>
2424
<artifactId>dubbo-cluster</artifactId>
2525
<packaging>jar</packaging>

‎dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ClusterUtils.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ public static URL mergeUrl(URL remoteUrl, Map<String, String> localMap) {
5757

5858
map.remove(Constants.ALIVE_KEY);
5959
map.remove(Constants.DEFAULT_KEY_PREFIX + Constants.ALIVE_KEY);
60+
61+
map.remove(Constants.TRANSPORTER_KEY);
62+
map.remove(Constants.DEFAULT_KEY_PREFIX + Constants.TRANSPORTER_KEY);
6063
}
6164

6265
if (localMap != null && localMap.size() > 0) {
@@ -81,7 +84,10 @@ public static URL mergeUrl(URL remoteUrl, Map<String, String> localMap) {
8184
map.put(Constants.METHODS_KEY, methods);
8285
}
8386
// 保留provider的启动timestamp
84-
map.put(Constants.REMOTE_TIMESTAMP_KEY, remoteMap.get(Constants.TIMESTAMP_KEY));
87+
String remoteTimestamp = remoteMap.get(Constants.TIMESTAMP_KEY);
88+
if (remoteTimestamp != null && remoteTimestamp.length() > 0) {
89+
map.put(Constants.REMOTE_TIMESTAMP_KEY, remoteMap.get(Constants.TIMESTAMP_KEY));
90+
}
8591
// 合并filter和listener
8692
String remoteFilter = remoteMap.get(Constants.REFERENCE_FILTER_KEY);
8793
String localFilter = localMap.get(Constants.REFERENCE_FILTER_KEY);

‎dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.alibaba.dubbo.rpc.cluster.configurator.absent;
1717

1818
import com.alibaba.dubbo.common.URL;
19+
import com.alibaba.dubbo.common.utils.NetUtils;
1920

2021
import junit.framework.Assert;
2122
import org.junit.Test;
@@ -31,33 +32,35 @@ public class AbsentConfiguratorTest {
3132
public void testOverride_Application() {
3233
AbsentConfigurator configurator = new AbsentConfigurator(URL.valueOf("override://foo@0.0.0.0/com.foo.BarService?timeout=200"));
3334

34-
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo"));
35+
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&side=consumer"));
3536
Assert.assertEquals("200", url.getParameter("timeout"));
3637

37-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000"));
38+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000&side=consumer"));
3839
Assert.assertEquals("1000", url.getParameter("timeout"));
3940

40-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar"));
41+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&side=consumer"));
4142
Assert.assertNull(url.getParameter("timeout"));
4243

43-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000"));
44+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer"));
4445
Assert.assertEquals("1000", url.getParameter("timeout"));
4546
}
4647

4748
@Test
4849
public void testOverride_Host() {
49-
AbsentConfigurator configurator = new AbsentConfigurator(URL.valueOf("override://10.20.153.10/com.foo.BarService?timeout=200"));
50+
AbsentConfigurator configurator = new AbsentConfigurator(URL.valueOf("override://" + NetUtils.getLocalHost() + "/com.foo.BarService?timeout=200"));
5051

51-
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo"));
52+
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&side=consumer"));
5253
Assert.assertEquals("200", url.getParameter("timeout"));
5354

54-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000"));
55+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000&side=consumer"));
5556
Assert.assertEquals("1000", url.getParameter("timeout"));
5657

57-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar"));
58+
AbsentConfigurator configurator1 = new AbsentConfigurator(URL.valueOf("override://10.20.153.10/com.foo.BarService?timeout=200"));
59+
60+
url = configurator1.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&side=consumer"));
5861
Assert.assertNull(url.getParameter("timeout"));
5962

60-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000"));
63+
url = configurator1.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer"));
6164
Assert.assertEquals("1000", url.getParameter("timeout"));
6265
}
6366

‎dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package com.alibaba.dubbo.rpc.cluster.configurator.override;
1717

1818
import com.alibaba.dubbo.common.URL;
19+
import com.alibaba.dubbo.common.utils.NetUtils;
20+
import com.alibaba.dubbo.rpc.cluster.configurator.absent.AbsentConfigurator;
1921

2022
import junit.framework.Assert;
2123
import org.junit.Test;
@@ -31,33 +33,35 @@ public class OverrideConfiguratorTest {
3133
public void testOverride_Application() {
3234
OverrideConfigurator configurator = new OverrideConfigurator(URL.valueOf("override://foo@0.0.0.0/com.foo.BarService?timeout=200"));
3335

34-
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo"));
36+
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&side=consumer"));
3537
Assert.assertEquals("200", url.getParameter("timeout"));
3638

37-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000"));
39+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000&side=consumer"));
3840
Assert.assertEquals("200", url.getParameter("timeout"));
3941

40-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar"));
42+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&side=consumer"));
4143
Assert.assertNull(url.getParameter("timeout"));
4244

43-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000"));
45+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer"));
4446
Assert.assertEquals("1000", url.getParameter("timeout"));
4547
}
4648

4749
@Test
4850
public void testOverride_Host() {
49-
OverrideConfigurator configurator = new OverrideConfigurator(URL.valueOf("override://10.20.153.10/com.foo.BarService?timeout=200"));
51+
OverrideConfigurator configurator = new OverrideConfigurator(URL.valueOf("override://" + NetUtils.getLocalHost() + "/com.foo.BarService?timeout=200"));
5052

51-
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo"));
53+
URL url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&side=consumer"));
5254
Assert.assertEquals("200", url.getParameter("timeout"));
5355

54-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000"));
56+
url = configurator.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000&side=consumer"));
5557
Assert.assertEquals("200", url.getParameter("timeout"));
5658

57-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar"));
59+
AbsentConfigurator configurator1 = new AbsentConfigurator(URL.valueOf("override://10.20.153.10/com.foo.BarService?timeout=200"));
60+
61+
url = configurator1.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&side=consumer"));
5862
Assert.assertNull(url.getParameter("timeout"));
5963

60-
url = configurator.configure(URL.valueOf("dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000"));
64+
url = configurator1.configure(URL.valueOf("dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer"));
6165
Assert.assertEquals("1000", url.getParameter("timeout"));
6266
}
6367

‎dubbo-common/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.alibaba</groupId>
2121
<artifactId>dubbo-parent</artifactId>
22-
<version>2.5.6</version>
22+
<version>2.5.7</version>
2323
</parent>
2424
<artifactId>dubbo-common</artifactId>
2525
<packaging>jar</packaging>
@@ -54,7 +54,6 @@
5454
<dependency>
5555
<groupId>com.alibaba</groupId>
5656
<artifactId>fastjson</artifactId>
57-
<scope>provided</scope>
5857
</dependency>
5958
<dependency>
6059
<groupId>org.jvnet.sorcerer</groupId>

‎dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,20 @@ public class Constants {
582582

583583
public static final String GENERIC_SERIALIZATION_BEAN = "bean";
584584

585+
public static final String DUBBO_IP_TO_REGISTRY = "DUBBO_IP_TO_REGISTRY";
586+
587+
public static final String DUBBO_PORT_TO_REGISTRY = "DUBBO_PORT_TO_REGISTRY";
588+
589+
public static final String DUBBO_IP_TO_BIND = "DUBBO_IP_TO_BIND";
590+
591+
public static final String DUBBO_PORT_TO_BIND = "DUBBO_PORT_TO_BIND";
592+
593+
public static final String BIND_IP_KEY = "bind.ip";
594+
595+
public static final String BIND_PORT_KEY = "bind.port";
596+
597+
public static final String REGISTER_IP_KEY = "register.ip";
598+
585599
/*
586600
* private Constants(){ }
587601
*/

0 commit comments

Comments
 (0)
⚡