Skip to content

Commit d01cf26

Browse files
mercyblitzmercyblitz
authored
0.2.1 (#345)
* Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread
1 parent fb2be00 commit d01cf26

30 files changed

+240
-97
lines changed

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616
*/
1717
package com.alibaba.boot.dubbo.actuate.autoconfigure;
1818

19-
import com.alibaba.boot.dubbo.actuate.endpoint.*;
19+
import com.alibaba.boot.dubbo.actuate.endpoint.DubboConfigsMetadataEndpoint;
20+
import com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpoint;
21+
import com.alibaba.boot.dubbo.actuate.endpoint.DubboPropertiesEndpoint;
22+
import com.alibaba.boot.dubbo.actuate.endpoint.DubboReferencesMetadataEndpoint;
23+
import com.alibaba.boot.dubbo.actuate.endpoint.DubboServicesMetadataEndpoint;
24+
import com.alibaba.boot.dubbo.actuate.endpoint.DubboShutdownEndpoint;
25+
2026
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
2127
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
2228
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -27,7 +33,7 @@
2733
/**
2834
* Dubbo {@link Endpoint} Auto-{@link Configuration}
2935
*
30-
* @author <a href="mailto:[email protected]">Mercy</a>
36+
*
3137
* @see Endpoint
3238
* @see Configuration
3339
* @since 0.2.0

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicator;
2020
import com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicatorProperties;
2121
import com.alibaba.boot.dubbo.autoconfigure.DubboAutoConfiguration;
22+
2223
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
2324
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
2425
import org.springframework.boot.actuate.health.HealthIndicator;
@@ -33,7 +34,7 @@
3334
/**
3435
* Dubbo {@link DubboHealthIndicator} Auto Configuration
3536
*
36-
* @author <a href="mailto:[email protected]">Mercy</a>
37+
*
3738
* @see HealthIndicator
3839
* @since 1.0.0
3940
*/

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.alibaba.dubbo.config.ProtocolConfig;
2020
import com.alibaba.dubbo.config.spring.ServiceBean;
2121
import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
22+
2223
import org.springframework.beans.BeansException;
2324
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
2425
import org.springframework.context.ApplicationContext;
@@ -45,7 +46,7 @@
4546
/**
4647
* Abstract Dubbo {@link Endpoint @Endpoint}
4748
*
48-
* @author <a href="mailto:[email protected]">Mercy</a>
49+
*
4950
* @since 0.2.0
5051
*/
5152
public abstract class AbstractDubboEndpoint implements ApplicationContextAware, EnvironmentAware {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
/**
4141
* Dubbo Configs Metadata {@link Endpoint}
4242
*
43-
* @author <a href="mailto:[email protected]">Mercy</a>
43+
*
4444
* @since 0.2.0
4545
*/
4646
@Endpoint(id = "dubboConfigs")

‎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
@@ -34,7 +34,7 @@
3434
/**
3535
* Actuator {@link Endpoint} to expose Dubbo Meta Data
3636
*
37-
* @author <a href="mailto:[email protected]">Mercy</a>
37+
*
3838
* @see Endpoint
3939
* @since 1.0.0
4040
*/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/**
2727
* Dubbo Properties {@link Endpoint}
2828
*
29-
* @author <a href="mailto:[email protected]">Mercy</a>
29+
*
3030
* @since 1.0.0
3131
*/
3232
@Endpoint(id = "dubboProperties")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* Dubbo {@link Reference} Metadata {@link Endpoint}
3232
*
33-
* @author <a href="mailto:[email protected]">Mercy</a>
33+
*
3434
* @since 1.0.0
3535
*/
3636
@Endpoint(id = "dubboReferences")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Dubbo {@link Service} Metadata {@link Endpoint}
3030
*
31-
* @author <a href="mailto:[email protected]">Mercy</a>
31+
*
3232
* @since 0.2.0
3333
*/
3434
@Endpoint(id = "dubboServices")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* Dubbo Shutdown
3434
*
35-
* @author <a href="mailto:[email protected]">Mercy</a>
35+
*
3636
* @since 0.2.0
3737
*/
3838
@Endpoint(id = "dubboShutdown")

‎dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicator.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.alibaba.dubbo.common.status.StatusChecker;
2121
import com.alibaba.dubbo.config.ProtocolConfig;
2222
import com.alibaba.dubbo.config.ProviderConfig;
23+
2324
import org.springframework.beans.factory.annotation.Autowired;
2425
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
2526
import org.springframework.boot.actuate.health.Health;
@@ -37,7 +38,7 @@
3738
/**
3839
* Dubbo {@link HealthIndicator}
3940
*
40-
* @author <a href="mailto:[email protected]">Mercy</a>
41+
*
4142
* @see HealthIndicator
4243
* @since 1.0.0
4344
*/

‎dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* Dubbo {@link HealthIndicator} Properties
3232
*
33-
* @author <a href="mailto:[email protected]">Mercy</a>
33+
*
3434
* @see HealthIndicator
3535
* @since 1.0.0
3636
*/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* {@link DubboEndpoint} Test
3434
*
35-
* @author <a href="mailto:[email protected]">Mercy</a>
35+
*
3636
* @see DubboEndpoint
3737
* @since 1.0.0
3838
*/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/**
3434
* {@link DubboEndpointsAutoConfiguration} Test
3535
*
36-
* @author <a href="mailto:[email protected]">Mercy</a>
36+
*
3737
* @since 0.2.0
3838
*/
3939
@RunWith(SpringRunner.class)

‎dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.alibaba.boot.dubbo.actuate.health;
1818

1919
import com.alibaba.dubbo.config.spring.context.annotation.EnableDubboConfig;
20+
2021
import org.junit.Assert;
2122
import org.junit.Test;
2223
import org.junit.runner.RunWith;
@@ -33,7 +34,7 @@
3334
/**
3435
* {@link DubboHealthIndicator} Test
3536
*
36-
* @author <a href="mailto:[email protected]">Mercy</a>
37+
*
3738
* @see DubboHealthIndicator
3839
* @since 1.0.0
3940
*/

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

+25-23
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.alibaba.dubbo.config.spring.context.annotation.DubboConfigConfiguration;
2727
import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo;
2828
import com.alibaba.dubbo.config.spring.context.annotation.EnableDubboConfig;
29+
2930
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3031
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3132
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -38,14 +39,15 @@
3839

3940
import java.util.Set;
4041

41-
import static com.alibaba.boot.dubbo.util.DubboUtils.*;
42+
import static com.alibaba.boot.dubbo.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME;
43+
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_PREFIX;
44+
import static com.alibaba.boot.dubbo.util.DubboUtils.MULTIPLE_CONFIG_PROPERTY_NAME;
4245
import static java.util.Collections.emptySet;
4346
import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE;
4447

4548
/**
4649
* Dubbo Auto {@link Configuration}
4750
*
48-
* @author <a href="mailto:[email protected]">Mercy</a>
4951
* @see ApplicationConfig
5052
* @see Service
5153
* @see Reference
@@ -59,27 +61,6 @@
5961
@ConditionalOnClass(AbstractConfig.class)
6062
public class DubboAutoConfiguration {
6163

62-
/**
63-
* Single Dubbo Config Configuration
64-
*
65-
* @see EnableDubboConfig
66-
* @see DubboConfigConfiguration.Single
67-
*/
68-
@EnableDubboConfig
69-
protected static class SingleDubboConfigConfiguration {
70-
}
71-
72-
/**
73-
* Multiple Dubbo Config Configuration , equals @EnableDubboConfig.multiple() == <code>true</code>
74-
*
75-
* @see EnableDubboConfig
76-
* @see DubboConfigConfiguration.Multiple
77-
*/
78-
@ConditionalOnProperty(name = MULTIPLE_CONFIG_PROPERTY_NAME, havingValue = "true")
79-
@EnableDubboConfig(multiple = true)
80-
protected static class MultipleDubboConfigConfiguration {
81-
}
82-
8364
/**
8465
* Creates {@link ServiceAnnotationBeanPostProcessor} Bean
8566
*
@@ -112,4 +93,25 @@ public ReferenceAnnotationBeanPostProcessor referenceAnnotationBeanPostProcessor
11293
return new ReferenceAnnotationBeanPostProcessor();
11394
}
11495

96+
/**
97+
* Single Dubbo Config Configuration
98+
*
99+
* @see EnableDubboConfig
100+
* @see DubboConfigConfiguration.Single
101+
*/
102+
@EnableDubboConfig
103+
protected static class SingleDubboConfigConfiguration {
104+
}
105+
106+
/**
107+
* Multiple Dubbo Config Configuration , equals @EnableDubboConfig.multiple() == <code>true</code>
108+
*
109+
* @see EnableDubboConfig
110+
* @see DubboConfigConfiguration.Multiple
111+
*/
112+
@ConditionalOnProperty(name = MULTIPLE_CONFIG_PROPERTY_NAME, havingValue = "true")
113+
@EnableDubboConfig(multiple = true)
114+
protected static class MultipleDubboConfigConfiguration {
115+
}
116+
115117
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
* Spring Boot Relaxed {@link DubboConfigBinder} implementation
3737
* see org.springframework.boot.context.properties.ConfigurationPropertiesBinder
3838
*
39-
* @author <a href="mailto:[email protected]">Mercy</a>
4039
* @since 0.1.1
4140
*/
4241
public class RelaxedDubboConfigBinder extends AbstractDubboConfigBinder {

0 commit comments

Comments
 (0)