Skip to content

Commit fa7405a

Browse files
mercyblitzmercyblitz
authored
0.1.x (#332)
* Bug fix on test case * Polish #327 & #325 * Polish #321 * Polish #220 no program * Switch Yaml file * Update version to be 0.2.0 * Polish #218 * Update Documents * Fix the test case's bugs * Fix plugins' issues * Fix test-cases * Fix test cases * Fixes an issue on DubboMvcEndpoint
1 parent b9a86fa commit fa7405a

File tree

12 files changed

+23
-22
lines changed

12 files changed

+23
-22
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ management.port = 9091
147147
demo.service.version = 1.0.0
148148

149149
# Base packages to scan Dubbo Components (e.g @Service , @Reference)
150-
dubbo.scan.basePackages = com.alibaba.boot.dubbo.demo.provider.service
150+
dubbo.scan.base-packages = com.alibaba.boot.dubbo.demo.provider.service
151151

152152
# Dubbo Config properties
153153
## ApplicationConfig Bean

‎README_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ management.port = 9091
150150
demo.service.version = 1.0.0
151151

152152
# Base packages to scan Dubbo Components (e.g @Service , @Reference)
153-
dubbo.scan.basePackages = com.alibaba.boot.dubbo.demo.provider.service
153+
dubbo.scan.base-packages = com.alibaba.boot.dubbo.demo.provider.service
154154

155155
# Dubbo Config properties
156156
## ApplicationConfig Bean

‎dubbo-spring-boot-actuator/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Actuator endpoint `dubbo` supports Spring Web MVC Endpoints :
195195
"dubbo.protocol.port": "12345",
196196
"dubbo.registry.address": "N/A",
197197
"dubbo.registry.id": "my-registry",
198-
"dubbo.scan.basePackages": "com.alibaba.boot.dubbo.demo.provider.service"
198+
"dubbo.scan.base-packages": "com.alibaba.boot.dubbo.demo.provider.service"
199199
}
200200
```
201201

‎dubbo-spring-boot-actuator/README_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ Actuator endpoint `dubbo` supports Spring Web MVC Endpoints :
200200
"dubbo.protocol.port": "12345",
201201
"dubbo.registry.address": "N/A",
202202
"dubbo.registry.id": "my-registry",
203-
"dubbo.scan.basePackages": "com.alibaba.boot.dubbo.demo.provider.service"
203+
"dubbo.scan.base-packages": "com.alibaba.boot.dubbo.demo.provider.service"
204204
}
205205
```
206206

‎dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.boot.actuate.autoconfigure.ManagementContextConfiguration;
2424
import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
2525
import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
26+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2627
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2829
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -41,10 +42,10 @@
4142
public class DubboMvcEndpointManagementContextConfiguration {
4243

4344
@Bean
45+
@ConditionalOnBean(DubboEndpoint.class)
4446
@ConditionalOnMissingBean
4547
public DubboMvcEndpoint dubboMvcEndpoint(DubboEndpoint dubboEndpoint) {
4648
return new DubboMvcEndpoint(dubboEndpoint);
4749
}
4850

49-
5051
}

‎dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public Map<String, Object> invoke() {
6464

6565
Map<String, String> urls = new LinkedHashMap<>();
6666
urls.put("dubbo", DUBBO_GITHUB_URL);
67-
urls.put("google-group", DUBBO_GOOGLE_GROUP_URL);
67+
urls.put("mailing-list", DUBBO_MAILING_LIST);
6868
urls.put("github", DUBBO_SPRING_BOOT_GITHUB_URL);
6969
urls.put("issues", DUBBO_SPRING_BOOT_ISSUES_URL);
7070
urls.put("git", DUBBO_SPRING_BOOT_GIT_URL);

‎dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ public void testInvoke() {
7272
Assert.assertEquals(getVersion(DubboUtils.class, "1.0.0"), versions.get("dubbo-spring-boot"));
7373
Assert.assertEquals(getVersion(), versions.get("dubbo"));
7474

75-
Assert.assertEquals("https://github.com/alibaba/dubbo", urls.get("dubbo"));
76-
Assert.assertEquals("http://groups.google.com/group/dubbo", urls.get("google-group"));
77-
Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project", urls.get("github"));
78-
Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project/issues", urls.get("issues"));
79-
Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project.git", urls.get("git"));
75+
Assert.assertEquals("https://github.com/apache/incubator-dubbo", urls.get("dubbo"));
76+
Assert.assertEquals("[email protected]", urls.get("mailing-list"));
77+
Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project", urls.get("github"));
78+
Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project/issues", urls.get("issues"));
79+
Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project.git", urls.get("git"));
8080

8181
}
8282

‎dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"dubbo.protocol.port=20880",
5555
"dubbo.provider.id=my-provider",
5656
"dubbo.provider.host=127.0.0.1",
57-
"dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint.mvc"
57+
"dubbo.scan.base-packages=com.alibaba.boot.dubbo.actuate.endpoint.mvc"
5858
}
5959
)
6060
@SpringBootTest(
@@ -166,7 +166,7 @@ public void testProperties() {
166166
Assert.assertEquals("20880", properties.get("dubbo.protocol.port"));
167167
Assert.assertEquals("my-provider", properties.get("dubbo.provider.id"));
168168
Assert.assertEquals("127.0.0.1", properties.get("dubbo.provider.host"));
169-
Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint.mvc", properties.get("dubbo.scan.basePackages"));
169+
Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint.mvc", properties.get("dubbo.scan.base-packages"));
170170
}
171171

172172

‎dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.core.annotation.Order;
2727

2828
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL;
29-
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GOOGLE_GROUP_URL;
29+
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST;
3030
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL;
3131
import static com.alibaba.boot.dubbo.util.DubboUtils.LINE_SEPARATOR;
3232

@@ -74,8 +74,8 @@ String buildBannerText() {
7474
.append(" :: Dubbo (v").append(Version.getVersion()).append(") : ")
7575
.append(DUBBO_GITHUB_URL)
7676
.append(LINE_SEPARATOR)
77-
.append(" :: Google group : ")
78-
.append(DUBBO_GOOGLE_GROUP_URL)
77+
.append(" :: Mailing List : ")
78+
.append(DUBBO_MAILING_LIST)
7979
.append(LINE_SEPARATOR)
8080
;
8181

‎dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ public abstract class DubboUtils {
110110
public static final String DUBBO_GITHUB_URL = "https://github.com/apache/incubator-dubbo";
111111

112112
/**
113-
* The google group URL of Dubbo
113+
* The dubbo mailing List
114114
*/
115-
public static final String DUBBO_GOOGLE_GROUP_URL = "[email protected]";
115+
public static final String DUBBO_MAILING_LIST = "[email protected]";
116116

117117
/**
118118
* Filters Dubbo Properties from {@link ConfigurableEnvironment}

‎dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import static com.alibaba.boot.dubbo.util.DubboUtils.DEFAULT_OVERRIDE_CONFIG_PROPERTY_VALUE;
2828
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_CONFIG_PREFIX;
2929
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL;
30-
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GOOGLE_GROUP_URL;
30+
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST;
3131
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_PREFIX;
3232
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SCAN_PREFIX;
3333
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL;
@@ -39,7 +39,7 @@
3939

4040
/**
4141
* {@link DubboUtils} Test
42-
*
42+
*Ø
4343
* @author <a href="mailto:[email protected]">Mercy</a>
4444
* @see DubboUtils
4545
* @since 1.0.0
@@ -67,7 +67,7 @@ public void testConstants() {
6767

6868
Assert.assertEquals("https://github.com/apache/incubator-dubbo", DUBBO_GITHUB_URL);
6969

70-
Assert.assertEquals("[email protected]", DUBBO_GOOGLE_GROUP_URL);
70+
Assert.assertEquals("[email protected]", DUBBO_MAILING_LIST);
7171

7272
Assert.assertFalse(DEFAULT_MULTIPLE_CONFIG_PROPERTY_VALUE);
7373

‎dubbo-spring-boot-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
<configuration>
306306
<rules>
307307
<requireJavaVersion>
308-
<version>[1.8,)</version>
308+
<version>[1.7,)</version>
309309
</requireJavaVersion>
310310
<requireProperty>
311311
<property>project.name</property>

0 commit comments

Comments
 (0)