diecui1202 closed pull request #2582: applicationmodel provider & consumer
serviceName is not unique
URL: https://github.com/apache/incubator-dubbo/pull/2582
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
index c6c75b16c6..48abbf7250 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
@@ -331,8 +331,8 @@ private void init() {
//attributes are stored by system context.
StaticContext.getSystemContext().putAll(attributes);
ref = createProxy(map);
- ConsumerModel consumerModel = new
ConsumerModel(getUniqueServiceName(), this, ref, interfaceClass.getMethods());
- ApplicationModel.initConsumerModel(getUniqueServiceName(),
consumerModel);
+ ConsumerModel consumerModel = new
ConsumerModel(getUniqueServiceName(ref), this, ref,
interfaceClass.getMethods());
+ ApplicationModel.initConsumerModel(getUniqueServiceName(ref),
consumerModel);
}
@SuppressWarnings({"unchecked", "rawtypes", "deprecation"})
@@ -532,7 +532,7 @@ public void setProtocol(String protocol) {
}
@Parameter(excluded = true)
- public String getUniqueServiceName() {
+ public String getUniqueServiceName(T proxy) {
StringBuilder buf = new StringBuilder();
if (group != null && group.length() > 0) {
buf.append(group).append("/");
@@ -541,6 +541,7 @@ public String getUniqueServiceName() {
if (version != null && version.length() > 0) {
buf.append(":").append(version);
}
+ buf.append("/").append(proxy.hashCode());
return buf.toString();
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
index ec6dcd982c..cfa9fd1db3 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -315,8 +315,8 @@ protected synchronized void doExport() {
path = interfaceName;
}
doExportUrls();
- ProviderModel providerModel = new
ProviderModel(getUniqueServiceName(), this, ref);
- ApplicationModel.initProviderModel(getUniqueServiceName(),
providerModel);
+ ProviderModel providerModel = new
ProviderModel(getUniqueServiceName(ref), this, ref);
+ ApplicationModel.initProviderModel(getUniqueServiceName(ref),
providerModel);
}
private void checkRef() {
@@ -840,7 +840,7 @@ public void setProviders(List<ProviderConfig> providers) {
}
@Parameter(excluded = true)
- public String getUniqueServiceName() {
+ public String getUniqueServiceName(T ref) {
StringBuilder buf = new StringBuilder();
if (group != null && group.length() > 0) {
buf.append(group).append("/");
@@ -849,6 +849,7 @@ public String getUniqueServiceName() {
if (version != null && version.length() > 0) {
buf.append(":").append(version);
}
+ buf.append("/").append(ref.hashCode());
return buf.toString();
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java
index 888dc017cc..31c01b5551 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java
@@ -18,11 +18,15 @@
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.config.api.DemoService;
+import com.alibaba.dubbo.config.api.Greeting;
import com.alibaba.dubbo.config.provider.impl.DemoServiceImpl;
import junit.framework.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
public class ReferenceConfigTest {
@Test
@@ -60,4 +64,20 @@ public void testInjvm() throws Exception {
}
}
+ @Test
+ public void testUniqueServiceName() throws Exception {
+ Greeting greeting=new Greeting() {
+ @Override
+ public String hello() {
+ return null;
+ }
+ };
+
+ ReferenceConfig referenceConfig=new ReferenceConfig();
+ referenceConfig.setGroup("dubbo");
+ referenceConfig.setInterface(Greeting.class);
+ referenceConfig.setVersion("1.0.0");
+
assertThat(referenceConfig.getUniqueServiceName(greeting),equalTo("dubbo/" +
Greeting.class.getName() + ":1.0.0/"+greeting.hashCode()));
+ }
+
}
\ No newline at end of file
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ServiceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ServiceConfigTest.java
index ed5a2e33d7..b66777dace 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ServiceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ServiceConfigTest.java
@@ -196,10 +196,16 @@ public void testGeneric2() throws Exception {
@Test
public void testUniqueServiceName() throws Exception {
+ Greeting greeting=new Greeting() {
+ @Override
+ public String hello() {
+ return null;
+ }
+ };
ServiceConfig<Greeting> service = new ServiceConfig<Greeting>();
service.setGroup("dubbo");
service.setInterface(Greeting.class);
service.setVersion("1.0.0");
- assertThat(service.getUniqueServiceName(), equalTo("dubbo/" +
Greeting.class.getName() + ":1.0.0"));
+ assertThat(service.getUniqueServiceName(greeting), equalTo("dubbo/" +
Greeting.class.getName() + ":1.0.0/"+greeting.hashCode()));
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
