0.2.1

dubbo-spring-boot-actuator/README.md

@@ -23,7 +23,7 @@ For now, `dubbo-spring-boot-actuator` will separate two versions for Spring Boot
 
 * `0.1.x` is a legacy version for maintaining Spring Boot 1.x
 
-  ​
+
 
 
 ## Integrate with Maven
@@ -503,10 +503,10 @@ Dubbo Spring Boot providers actuator endpoints , however some of them are disabl
 ```properties
 # Enables Dubbo All Endpoints
 management.endpoint.dubbo.enabled = true
-management.endpoint.dubboShutdown.enabled = true
-management.endpoint.dubboConfigs.enabled = true
-management.endpoint.dubboServices.enabled = true
-management.endpoint.dubboReferences.enabled = true
-management.endpoint.dubboProperties.enabled = true
+management.endpoint.dubboshutdown.enabled = true
+management.endpoint.dubboconfigs.enabled = true
+management.endpoint.dubboservices.enabled = true
+management.endpoint.dubboreferences.enabled = true
+management.endpoint.dubboproperties.enabled = true
 ```
 

dubbo-spring-boot-actuator/pom.xml

@@ -32,15 +32,6 @@
 
     <dependencies>
 
-        <!-- Compile -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -43,7 +43,7 @@
  *
  * @since 0.2.0
  */
-@Endpoint(id = "dubboConfigs")
+@Endpoint(id = "dubboconfigs")
 public class DubboConfigsMetadataEndpoint extends AbstractDubboEndpoint {
 
     @ReadOperation

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

@@ -29,7 +29,7 @@
  *
  * @since 1.0.0
  */
-@Endpoint(id = "dubboProperties")
+@Endpoint(id = "dubboproperties")
 public class DubboPropertiesEndpoint extends AbstractDubboEndpoint {
 
     @ReadOperation

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

@@ -33,7 +33,7 @@
  *
  * @since 1.0.0
  */
-@Endpoint(id = "dubboReferences")
+@Endpoint(id = "dubboreferences")
 public class DubboReferencesMetadataEndpoint extends AbstractDubboEndpoint {
 
     @ReadOperation

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

@@ -31,7 +31,7 @@
  *
  * @since 0.2.0
  */
-@Endpoint(id = "dubboServices")
+@Endpoint(id = "dubboservices")
 public class DubboServicesMetadataEndpoint extends AbstractDubboEndpoint {
 
     @ReadOperation

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

@@ -32,10 +32,9 @@
 /**
  * Dubbo Shutdown
  *
- *
  * @since 0.2.0
  */
-@Endpoint(id = "dubboShutdown")
+@Endpoint(id = "dubboshutdown")
 public class DubboShutdownEndpoint extends AbstractDubboEndpoint {
 
 

dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties

@@ -4,19 +4,18 @@
 
 # Set enabled for Dubbo Endpoints
 management.endpoint.dubbo.enabled = true
-management.endpoint.dubboShutdown.enabled = false
-management.endpoint.dubboConfigs.enabled = true
-management.endpoint.dubboServices.enabled = false
-management.endpoint.dubboReferences.enabled = false
-management.endpoint.dubboProperties.enabled = true
+management.endpoint.dubboshutdown.enabled = false
+management.endpoint.dubboconfigs.enabled = true
+management.endpoint.dubboservices.enabled = false
+management.endpoint.dubboreferences.enabled = false
+management.endpoint.dubboproperties.enabled = true
 
 # "management.endpoints.web.base-path" should not be configured in this file
 
 # Re-defines path-mapping of Dubbo Web Endpoints
-management.endpoints.web.path-mapping.dubboShutdown = dubbo/shutdown
-management.endpoints.web.path-mapping.dubboConfigs = dubbo/configs
-management.endpoints.web.path-mapping.dubboServices = dubbo/services
-management.endpoints.web.path-mapping.dubboReferences = dubbo/references
-management.endpoints.web.path-mapping.dubboProperties = dubbo/properties
-
 
+management.endpoints.web.path-mapping.dubboshutdown = dubbo/shutdown
+management.endpoints.web.path-mapping.dubboconfigs = dubbo/configs
+management.endpoints.web.path-mapping.dubboservices = dubbo/services
+management.endpoints.web.path-mapping.dubboreferences = dubbo/references
+management.endpoints.web.path-mapping.dubboproperties = dubbo/properties

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

@@ -19,21 +19,25 @@
 import com.alibaba.boot.dubbo.actuate.autoconfigure.DubboEndpointsAutoConfiguration;
 import com.alibaba.dubbo.config.annotation.Service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.Map;
 import java.util.SortedMap;
+import java.util.function.Supplier;
 
 /**
  * {@link DubboEndpointsAutoConfiguration} Test
  *
- *
  * @since 0.2.0
  */
 @RunWith(SpringRunner.class)
@@ -58,11 +62,12 @@
                 "dubbo.provider.host=127.0.0.1",
                 "dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint",
                 "management.endpoint.dubbo.enabled = true",
-                "management.endpoint.dubboShutdown.enabled = true",
-                "management.endpoint.dubboConfigs.enabled = true",
-                "management.endpoint.dubboServices.enabled = true",
-                "management.endpoint.dubboReferences.enabled = true",
-                "management.endpoint.dubboProperties.enabled = true",
+                "management.endpoint.dubboshutdown.enabled = true",
+                "management.endpoint.dubboconfigs.enabled = true",
+                "management.endpoint.dubboservices.enabled = true",
+                "management.endpoint.dubboreferences.enabled = true",
+                "management.endpoint.dubboproperties.enabled = true",
+                "management.endpoints.web.exposure.include = *",
         })
 @EnableAutoConfiguration
 public class DubboEndpointsAutoConfigurationTest {
@@ -85,6 +90,13 @@ public class DubboEndpointsAutoConfigurationTest {
     @Autowired
     private DubboShutdownEndpoint dubboShutdownEndpoint;
 
+    private RestTemplate restTemplate = new RestTemplate();
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Value("http://127.0.0.1:${local.management.port}${management.endpoints.web.base-path:/actuator}")
+    private String actuatorBaseURL;
 
     @Test
     public void testShutdown() throws Exception {
@@ -178,20 +190,35 @@ public void testProperties() {
         Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint", properties.get("dubbo.scan.basePackages"));
     }
 
+    @Test
+    public void testHttpEndpoints() throws JsonProcessingException {
+//        testHttpEndpoint("/dubbo", dubboEndpoint::invoke);
+        testHttpEndpoint("/dubbo/configs", dubboConfigsMetadataEndpoint::configs);
+        testHttpEndpoint("/dubbo/services", dubboServicesMetadataEndpoint::services);
+        testHttpEndpoint("/dubbo/references", dubboReferencesMetadataEndpoint::references);
+        testHttpEndpoint("/dubbo/properties", dubboPropertiesEndpoint::properties);
+    }
 
-@Service(
-        version = "${dubbo.service.version}",
-        application = "${dubbo.application.id}",
-        protocol = "${dubbo.protocol.id}",
-        registry = "${dubbo.registry.id}"
-)
-static class DefaultDemoService implements DemoService {
-
-    public String sayHello(String name) {
-        return "Hello, " + name + " (from Spring Boot)";
+    private void testHttpEndpoint(String actuatorURI, Supplier<Map> resultsSupplier) throws JsonProcessingException {
+        String actuatorURL = actuatorBaseURL + actuatorURI;
+        String response = restTemplate.getForObject(actuatorURL, String.class);
+        Assert.assertEquals(objectMapper.writeValueAsString(resultsSupplier.get()), response);
     }
 
-}
+
+    @Service(
+            version = "${dubbo.service.version}",
+            application = "${dubbo.application.id}",
+            protocol = "${dubbo.protocol.id}",
+            registry = "${dubbo.registry.id}"
+    )
+    static class DefaultDemoService implements DemoService {
+
+        public String sayHello(String name) {
+            return "Hello, " + name + " (from Spring Boot)";
+        }
+
+    }
 
     interface DemoService {
         String sayHello(String name);

dubbo-spring-boot-autoconfigure/pom.xml

@@ -27,8 +27,8 @@
 
     <artifactId>dubbo-spring-boot-autoconfigure</artifactId>
     <packaging>jar</packaging>
-    <name>Dubbo Spring Boot AutoConfigure</name>
-    <description>Dubbo Spring Boot AutoConfigure</description>
+    <name>Dubbo Spring Boot Auto-Configure</name>
+    <description>Dubbo Spring Boot Auto-Configure</description>
 
 
     <dependencies>

dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml

@@ -0,0 +1,74 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.alibaba.boot.samples</groupId>
+        <artifactId>dubbo-spring-boot-auto-configure-samples</artifactId>
+        <version>0.2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dubbo-spring-boot-auto-configure-consumer-sample</artifactId>
+    <name>Dubbo Spring Boot Samples : Auto-Configure :: Consumer Sample</name>
+    <dependencies>
+
+        <!-- Spring Boot dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.boot</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dubbo-spring-boot-sample-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.boot.dubbo.demo.consumer.bootstrap;
+
+import com.alibaba.boot.dubbo.demo.consumer.DemoService;
+import com.alibaba.dubbo.config.annotation.Reference;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Dubbo Auto Configuration Consumer Bootstrap
+ *
+ * @since 1.0.0
+ */
+@EnableAutoConfiguration
+public class DubboAutoConfigurationConsumerBootstrap {
+
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Reference(version = "1.0.0", url = "dubbo://localhost:12345")
+    private DemoService demoService;
+
+    @Bean
+    public ApplicationRunner runner() {
+        return args -> {
+            logger.info(demoService.sayHello("mercyblitz"));
+        };
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(DubboAutoConfigurationConsumerBootstrap.class).close();
+    }
+}

dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  application:
+    name: dubbo-auto-configure-consumer-sample