This is an automated email from the ASF dual-hosted git repository.
albumenj 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 438519cb71 fixed ServiceBeanNameBuilder same version/group conflict
(#10454) (#10455)
438519cb71 is described below
commit 438519cb71ec544fa87899f08222b761129646fd
Author: huangjikun <[email protected]>
AuthorDate: Mon Aug 15 09:44:50 2022 +0800
fixed ServiceBeanNameBuilder same version/group conflict (#10454) (#10455)
* fixed ServiceBeanNameBuilder same version/group conflict (#10454)
* fixed ServiceBeanNameBuilder same version/group conflict (#10454)
---
.../beans/factory/annotation/ServiceBeanNameBuilder.java | 3 ++-
.../factory/annotation/ServiceAnnotationPostProcessorTest.java | 2 +-
.../beans/factory/annotation/ServiceBeanNameBuilderTest.java | 10 ++++++++++
.../DubboEndpointAnnotationAutoConfigurationTest.java | 2 +-
.../autoconfigure/DubboEndpointAutoConfigurationTest.java | 2 +-
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilder.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilder.java
index d80bc97454..6bdddc9ed8 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilder.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilder.java
@@ -95,8 +95,9 @@ public class ServiceBeanNameBuilder {
}
private static void append(StringBuilder builder, String value) {
+ builder.append(SEPARATOR);
if (StringUtils.hasText(value)) {
- builder.append(SEPARATOR).append(value);
+ builder.append(value);
}
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
index aba4c12229..a4d26bfce5 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessorTest.java
@@ -95,7 +95,7 @@ public class ServiceAnnotationPostProcessorTest {
Assertions.assertEquals(3, serviceBeansMap.size());
- ServiceBean demoServiceBean =
serviceBeansMap.get("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:2.5.7");
+ ServiceBean demoServiceBean =
serviceBeansMap.get("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:2.5.7:");
Assertions.assertNotNull(demoServiceBean.getMethods());
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
index 07601a3d74..5bbbeaf80c 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
@@ -72,4 +72,14 @@ public class ServiceBeanNameBuilderTest {
builder.build());
}
+ @Test
+ public void testServiceNameBuild() {
+ ServiceBeanNameBuilder vBuilder =
ServiceBeanNameBuilder.create(INTERFACE_CLASS, environment);
+ String vBeanName = vBuilder.version("DUBBO").build();
+
+ ServiceBeanNameBuilder gBuilder =
ServiceBeanNameBuilder.create(INTERFACE_CLASS, environment);
+ String gBeanName = gBuilder.group("DUBBO").build();
+
+ Assertions.assertNotEquals(vBeanName, gBeanName);
+ }
}
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
b/dubbo-spring-boot/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
index b72d2cfef3..2268b9d3f3 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
@@ -179,7 +179,7 @@ public class DubboEndpointAnnotationAutoConfigurationTest {
Assert.assertEquals(1, services.size());
- Map<String, Object> demoServiceMeta =
services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfigurationTest$DemoService:1.0.0");
+ Map<String, Object> demoServiceMeta =
services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfigurationTest$DemoService:1.0.0:");
Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
b/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
index c4d62da487..e22741b872 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
@@ -166,7 +166,7 @@ public class DubboEndpointAutoConfigurationTest {
Assert.assertEquals(1, services.size());
- Map<String, Object> demoServiceMeta =
services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfigurationTest$DemoService:1.0.0");
+ Map<String, Object> demoServiceMeta =
services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfigurationTest$DemoService:1.0.0:");
Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
