apache
diff --git a/‎README.md‎
Lines changed: 4 additions & 4 deletions b/‎README.md‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎README_CN.md‎
Lines changed: 2 additions & 2 deletions b/‎README_CN.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎dubbo-spring-boot-actuator/README.md‎
Lines changed: 3 additions & 3 deletions b/‎dubbo-spring-boot-actuator/README.md‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎dubbo-spring-boot-actuator/pom.xml‎
Lines changed: 0 additions & 7 deletions b/‎dubbo-spring-boot-actuator/pom.xml‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java‎
Lines changed: 4 additions & 3 deletions b/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎dubbo-spring-boot-autoconfigure/README.md‎
Lines changed: 3 additions & 3 deletions b/‎dubbo-spring-boot-autoconfigure/README.md‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎config-popup-window.png‎ ‎…ot-autoconfigure/config-popup-window.png‎config-popup-window.png renamed to dubbo-spring-boot-autoconfigure/config-popup-window.png b/‎config-popup-window.png‎ ‎…ot-autoconfigure/config-popup-window.png‎config-popup-window.png renamed to dubbo-spring-boot-autoconfigure/config-popup-window.png
diff --git a/‎mconfig-popup-window.png‎ ‎…t-autoconfigure/mconfig-popup-window.png‎mconfig-popup-window.png renamed to dubbo-spring-boot-autoconfigure/mconfig-popup-window.png b/‎mconfig-popup-window.png‎ ‎…t-autoconfigure/mconfig-popup-window.png‎mconfig-popup-window.png renamed to dubbo-spring-boot-autoconfigure/mconfig-popup-window.png
diff --git a/‎dubbo-spring-boot-autoconfigure/pom.xml‎
Lines changed: 0 additions & 7 deletions b/‎dubbo-spring-boot-autoconfigure/pom.xml‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DelegatingPropertyResolver.java‎
Lines changed: 83 additions & 0 deletions b/‎dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DelegatingPropertyResolver.java‎
Lines changed: 83 additions & 0 deletions
@@ -4,7 +4,7 @@
 [![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project)
 ![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg)
 
-[Apache Dubbo(incubating)](https://github.com/apache/incubator-dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it aslo provides 
+[Apache Dubbo(incubating)](https://github.com/apache/incubator-dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it also provides 
 
 * [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., annotation-driven, auto configuration, externalized configuration).
 * [production-ready features](dubbo-spring-boot-actuator) (e.g., security, health checks, externalized configuration).
@@ -20,7 +20,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
 ```xml
 <properties>
     <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
-    <dubbo.version>2.7.0</dubbo.version>
+    <dubbo.version>2.7.1</dubbo.version>
 </properties>
 
 <dependencyManagement>
@@ -34,7 +34,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
             <scope>import</scope>
         </dependency>
 
-        <!-- Aapche Dubbo  -->
+        <!-- Apache Dubbo  -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-dependencies-bom</artifactId>
@@ -70,7 +70,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
     <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
-        <version>2.7.0</version>
+        <version>2.7.1</version>
     </dependency>
 
     <dependency>
 
@@ -22,7 +22,7 @@
 ```xml
 <properties>
     <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
-    <dubbo.version>2.7.0</dubbo.version>
+    <dubbo.version>2.7.1</dubbo.version>
 </properties>
 
 <dependencyManagement>
@@ -72,7 +72,7 @@
     <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
-        <version>2.7.0</version>
+        <version>2.7.1</version>
     </dependency>
 
     <dependency>
 
@@ -22,7 +22,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad
 <dependency>
     <groupId>org.apache.dubbo</groupId>
     <artifactId>dubbo-spring-boot-actuator</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
 </dependency>
 ```
 
@@ -171,8 +171,8 @@ Actuator endpoint `dubbo` supports Actuator Endpoints :
 {
   "timestamp": 1516623290166,
   "versions": {
-    "dubbo-spring-boot": "2.7.0",
-    "dubbo": "2.7.0"
+    "dubbo-spring-boot": "2.7.1",
+    "dubbo": "2.7.1"
   },
   "urls": {
     "dubbo": "https://github.com/apache/incubator-dubbo/",
 
@@ -58,13 +58,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Dubbo autoconfigure -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
 
@@ -16,15 +16,16 @@
  */
 package org.apache.dubbo.spring.boot.actuate.autoconfigure;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.dubbo.config.annotation.Service;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboConfigsMetadataEndpoint;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboMetadataEndpoint;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboPropertiesMetadataEndpoint;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboReferencesMetadataEndpoint;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboServicesMetadataEndpoint;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboShutdownEndpoint;
+
+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;
@@ -159,7 +160,7 @@ public void testServices() {
 
         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("providers:my-protocol:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfigurationTest$DemoService:1.0.0");
 
         Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
 
 
@@ -23,7 +23,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project
 <dependency>
     <groupId>org.apache.dubbo</groupId>
     <artifactId>dubbo-spring-boot-autoconfigure</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
 </dependency>
 ```
 
@@ -213,13 +213,13 @@ If you used advanced IDE tools , for instance [Jetbrains IDEA Ultimate](https://
 
 #### Case 1 - Single Bindings
 
-![](../config-popup-window.png)
+![](config-popup-window.png)
 
 
 
 #### Case 2 - Mutiple Bindings
 
-![](../mconfig-popup-window.png)
+![](mconfig-popup-window.png)
 
 
 
@@ -54,13 +54,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Dubbo -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
 
@@ -0,0 +1,83 @@
+/*
+ * 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 org.apache.dubbo.spring.boot.autoconfigure;
+
+import org.apache.dubbo.common.utils.Assert;
+import org.springframework.core.env.PropertyResolver;
+import org.springframework.lang.Nullable;
+
+/**
+ * Delegating {@link PropertyResolver}
+ *
+ * @since 2.7.1
+ */
+class DelegatingPropertyResolver implements PropertyResolver {
+
+    private final PropertyResolver delegate;
+
+    DelegatingPropertyResolver(PropertyResolver delegate) {
+        Assert.notNull(delegate, "The delegate of PropertyResolver must not be null");
+        this.delegate = delegate;
+    }
+
+    @Override
+    public boolean containsProperty(String key) {
+        return delegate.containsProperty(key);
+    }
+
+    @Override
+    @Nullable
+    public String getProperty(String key) {
+        return delegate.getProperty(key);
+    }
+
+    @Override
+    public String getProperty(String key, String defaultValue) {
+        return delegate.getProperty(key, defaultValue);
+    }
+
+    @Override
+    @Nullable
+    public <T> T getProperty(String key, Class<T> targetType) {
+        return delegate.getProperty(key, targetType);
+    }
+
+    @Override
+    public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
+        return delegate.getProperty(key, targetType, defaultValue);
+    }
+
+    @Override
+    public String getRequiredProperty(String key) throws IllegalStateException {
+        return delegate.getRequiredProperty(key);
+    }
+
+    @Override
+    public <T> T getRequiredProperty(String key, Class<T> targetType) throws IllegalStateException {
+        return delegate.getRequiredProperty(key, targetType);
+    }
+
+    @Override
+    public String resolvePlaceholders(String text) {
+        return delegate.resolvePlaceholders(text);
+    }
+
+    @Override
+    public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
+        return delegate.resolveRequiredPlaceholders(text);
+    }
+}