Polish apache#395

mercyblitz · Jan 25, 2019 · fc5fe09 · fc5fe09
1 parent ac4eeac
commit fc5fe09
Show file tree

Hide file tree

Showing 76 changed files with 348 additions and 757 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Dubbo Spring Boot Project 
+# Apache Dubbo Spring Boot Project 
 
 [![Build Status](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project) 
 [![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)
@@ -50,7 +50,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
 <dependencies>
     <!-- Dubbo Spring Boot Starter -->
     <dependency>
-        <groupId>com.alibaba.boot</groupId>
+        <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
         <version>0.2.1-SNAPSHOT</version>
     </dependency>
@@ -257,7 +257,7 @@ $ ./mvnw clean install
 
 ## Modules
 
-There are some modules in Dubbo Spring Boot Project, let's take a look at below overview:
+There are some modules in Apache Dubbo Spring Boot Project, let's take a look at below overview:
 
 
 

diff --git a/README_CN.md b/README_CN.md
@@ -24,7 +24,7 @@
 您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布，增加以下依赖到工程的 `pom.xml` 文件中：
 ```xml
 <dependency>
-    <groupId>com.alibaba.boot</groupId>
+    <groupId>org.apache.dubbo</groupId>
     <artifactId>dubbo-spring-boot-starter</artifactId>
     <version>0.2.1</version>
 </dependency>

diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md
@@ -31,7 +31,7 @@ For now, `dubbo-spring-boot-actuator` will separate two versions for Spring Boot
 You can introduce the latest `dubbo-spring-boot-actuator` to your project by adding the following dependency to your pom.xml
 ```xml
 <dependency>
-    <groupId>com.alibaba.boot</groupId>
+    <groupId>org.apache.dubbo</groupId>
     <artifactId>dubbo-spring-boot-actuator</artifactId>
     <version>0.2.1</version>
 </dependency>
@@ -272,7 +272,7 @@ The structure of JSON is simple Key-Value format , the key is property name as a
     "version": "1.0.0",
     "warmup": null,
     "weight": null,
-    "serviceClass": "com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService"
+    "serviceClass": "DefaultDemoService"
   }
 }
 ```

diff --git a/dubbo-spring-boot-actuator/README_CN.md b/dubbo-spring-boot-actuator/README_CN.md
@@ -29,14 +29,14 @@
 
     <!-- 功能特性 -->
     <dependency>
-        <groupId>com.alibaba.boot</groupId>
+        <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
         <version>0.2.1</version>
     </dependency>
 
     <!-- Production-Ready 特性 -->
     <dependency>
-        <groupId>com.alibaba.boot</groupId>
+        <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-actuator</artifactId>
         <version>0.2.1</version>
     </dependency>
@@ -258,7 +258,7 @@ The structure of JSON is simple Key-Value format , the key is property name as a
     "version": "1.0.0",
     "warmup": null,
     "weight": null,
-    "serviceClass": "com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService"
+    "serviceClass": "DefaultDemoService"
   }
 }
 ```

diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml
@@ -18,17 +18,17 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
+        <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-parent</artifactId>
-        <groupId>com.alibaba.boot</groupId>
         <version>${revision}</version>
         <relativePath>../dubbo-spring-boot-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dubbo-spring-boot-actuator</artifactId>
     <packaging>jar</packaging>
-    <name>Dubbo Spring Boot Actuator</name>
-    <description>Dubbo Spring Boot Actuator</description>
+    <name>Apache Dubbo Spring Boot Actuator</name>
+    <description>Apache Dubbo Spring Boot Actuator</description>
 
     <dependencies>
 
@@ -66,7 +66,7 @@
 
         <!-- Dubbo -->
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
             <optional>true</optional>
         </dependency>

diff --git a/...gure/DubboEndpointsAutoConfiguration.java → ...gure/DubboEndpointsAutoConfiguration.java b/...gure/DubboEndpointsAutoConfiguration.java → ...gure/DubboEndpointsAutoConfiguration.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.autoconfigure;
+package org.apache.dubbo.spring.boot.actuate.autoconfigure;
 
-import com.alibaba.boot.dubbo.actuate.endpoint.DubboConfigsMetadataEndpoint;
-import com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpoint;
-import com.alibaba.boot.dubbo.actuate.endpoint.DubboPropertiesEndpoint;
-import com.alibaba.boot.dubbo.actuate.endpoint.DubboReferencesMetadataEndpoint;
-import com.alibaba.boot.dubbo.actuate.endpoint.DubboServicesMetadataEndpoint;
-import com.alibaba.boot.dubbo.actuate.endpoint.DubboShutdownEndpoint;
+import org.apache.dubbo.spring.boot.actuate.endpoint.DubboConfigsMetadataEndpoint;
+import org.apache.dubbo.spring.boot.actuate.endpoint.DubboEndpoint;
+import org.apache.dubbo.spring.boot.actuate.endpoint.DubboPropertiesEndpoint;
+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 org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -33,7 +33,6 @@
 /**
  * Dubbo {@link Endpoint} Auto-{@link Configuration}
  *
- *
  * @see Endpoint
  * @see Configuration
  * @since 0.2.0

diff --git a/...ubboHealthIndicatorAutoConfiguration.java → ...ubboHealthIndicatorAutoConfiguration.java b/...ubboHealthIndicatorAutoConfiguration.java → ...ubboHealthIndicatorAutoConfiguration.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.autoconfigure;
+package org.apache.dubbo.spring.boot.actuate.autoconfigure;
 
-import com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicator;
-import com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicatorProperties;
-import com.alibaba.boot.dubbo.autoconfigure.DubboAutoConfiguration;
+import org.apache.dubbo.spring.boot.actuate.health.DubboHealthIndicator;
+import org.apache.dubbo.spring.boot.actuate.health.DubboHealthIndicatorProperties;
+import org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
@@ -34,7 +34,6 @@
 /**
  * Dubbo {@link DubboHealthIndicator} Auto Configuration
  *
- *
  * @see HealthIndicator
  * @since 1.0.0
  */

diff --git a/...tuate/endpoint/AbstractDubboEndpoint.java → ...tuate/endpoint/AbstractDubboEndpoint.java b/...tuate/endpoint/AbstractDubboEndpoint.java → ...tuate/endpoint/AbstractDubboEndpoint.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.endpoint;
+package org.apache.dubbo.spring.boot.actuate.endpoint;
 
-import com.alibaba.dubbo.config.ProtocolConfig;
-import com.alibaba.dubbo.config.spring.ServiceBean;
-import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
+import org.apache.dubbo.config.ProtocolConfig;
+import org.apache.dubbo.config.spring.ServiceBean;
+import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
 
 import org.springframework.beans.BeansException;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -39,14 +39,13 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor.BEAN_NAME;
+import static org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor.BEAN_NAME;
 import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors;
 import static org.springframework.util.ClassUtils.isPrimitiveOrWrapper;
 
 /**
  * Abstract Dubbo {@link Endpoint @Endpoint}
  *
- *
  * @since 0.2.0
  */
 public abstract class AbstractDubboEndpoint implements ApplicationContextAware, EnvironmentAware {
@@ -55,6 +54,17 @@ public abstract class AbstractDubboEndpoint implements ApplicationContextAware,
 
     protected ConfigurableEnvironment environment;
 
+    private static boolean isSimpleType(Class<?> type) {
+        return isPrimitiveOrWrapper(type)
+                || type == String.class
+                || type == BigDecimal.class
+                || type == BigInteger.class
+                || type == Date.class
+                || type == URL.class
+                || type == Class.class
+                ;
+    }
+
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.applicationContext = applicationContext;
@@ -110,16 +120,5 @@ protected Map<String, ProtocolConfig> getProtocolConfigsBeanMap() {
         return beansOfTypeIncludingAncestors(applicationContext, ProtocolConfig.class);
     }
 
-    private static boolean isSimpleType(Class<?> type) {
-        return isPrimitiveOrWrapper(type)
-                || type == String.class
-                || type == BigDecimal.class
-                || type == BigInteger.class
-                || type == Date.class
-                || type == URL.class
-                || type == Class.class
-                ;
-    }
-
 
 }
diff --git a/...ndpoint/DubboConfigsMetadataEndpoint.java → ...ndpoint/DubboConfigsMetadataEndpoint.java b/...ndpoint/DubboConfigsMetadataEndpoint.java → ...ndpoint/DubboConfigsMetadataEndpoint.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.endpoint;
-
-import com.alibaba.dubbo.config.AbstractConfig;
-import com.alibaba.dubbo.config.ApplicationConfig;
-import com.alibaba.dubbo.config.ConsumerConfig;
-import com.alibaba.dubbo.config.MethodConfig;
-import com.alibaba.dubbo.config.ModuleConfig;
-import com.alibaba.dubbo.config.MonitorConfig;
-import com.alibaba.dubbo.config.ProtocolConfig;
-import com.alibaba.dubbo.config.ProviderConfig;
-import com.alibaba.dubbo.config.ReferenceConfig;
-import com.alibaba.dubbo.config.RegistryConfig;
-import com.alibaba.dubbo.config.ServiceConfig;
+package org.apache.dubbo.spring.boot.actuate.endpoint;
+
+import org.apache.dubbo.config.AbstractConfig;
+import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.ConsumerConfig;
+import org.apache.dubbo.config.MethodConfig;
+import org.apache.dubbo.config.ModuleConfig;
+import org.apache.dubbo.config.MonitorConfig;
+import org.apache.dubbo.config.ProtocolConfig;
+import org.apache.dubbo.config.ProviderConfig;
+import org.apache.dubbo.config.ReferenceConfig;
+import org.apache.dubbo.config.RegistryConfig;
+import org.apache.dubbo.config.ServiceConfig;
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
@@ -40,7 +40,6 @@
 /**
  * Dubbo Configs Metadata {@link Endpoint}
  *
- *
  * @since 0.2.0
  */
 @Endpoint(id = "dubboconfigs")

diff --git a/...dubbo/actuate/endpoint/DubboEndpoint.java → .../boot/actuate/endpoint/DubboEndpoint.java b/...dubbo/actuate/endpoint/DubboEndpoint.java → .../boot/actuate/endpoint/DubboEndpoint.java
@@ -14,27 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.endpoint;
+package org.apache.dubbo.spring.boot.actuate.endpoint;
 
-import com.alibaba.boot.dubbo.util.DubboUtils;
-import com.alibaba.dubbo.common.Version;
+import org.apache.dubbo.common.Version;
+import org.apache.dubbo.spring.boot.util.DubboUtils;
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL;
-import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST;
-import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL;
-import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GIT_URL;
-import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_ISSUES_URL;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_GITHUB_URL;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_MAILING_LIST;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_GIT_URL;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_ISSUES_URL;
 
 /**
  * Actuator {@link Endpoint} to expose Dubbo Meta Data
  *
- *
  * @see Endpoint
  * @since 1.0.0
  */

diff --git a/...ate/endpoint/DubboPropertiesEndpoint.java → ...ate/endpoint/DubboPropertiesEndpoint.java b/...ate/endpoint/DubboPropertiesEndpoint.java → ...ate/endpoint/DubboPropertiesEndpoint.java
@@ -14,19 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.endpoint;
+package org.apache.dubbo.spring.boot.actuate.endpoint;
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 
 import java.util.SortedMap;
 
-import static com.alibaba.boot.dubbo.util.DubboUtils.filterDubboProperties;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.filterDubboProperties;
 
 /**
  * Dubbo Properties {@link Endpoint}
  *
- *
  * @since 1.0.0
  */
 @Endpoint(id = "dubboproperties")

diff --git a/...oint/DubboReferencesMetadataEndpoint.java → ...oint/DubboReferencesMetadataEndpoint.java b/...oint/DubboReferencesMetadataEndpoint.java → ...oint/DubboReferencesMetadataEndpoint.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.endpoint;
+package org.apache.dubbo.spring.boot.actuate.endpoint;
 
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.alibaba.dubbo.config.spring.ReferenceBean;
-import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
+import org.apache.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.spring.ReferenceBean;
+import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
 
 import org.springframework.beans.factory.annotation.InjectionMetadata;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -30,7 +30,6 @@
 /**
  * Dubbo {@link Reference} Metadata {@link Endpoint}
  *
- *
  * @since 1.0.0
  */
 @Endpoint(id = "dubboreferences")

diff --git a/...dpoint/DubboServicesMetadataEndpoint.java → ...dpoint/DubboServicesMetadataEndpoint.java b/...dpoint/DubboServicesMetadataEndpoint.java → ...dpoint/DubboServicesMetadataEndpoint.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.boot.dubbo.actuate.endpoint;
+package org.apache.dubbo.spring.boot.actuate.endpoint;
 
-import com.alibaba.dubbo.config.annotation.Service;
-import com.alibaba.dubbo.config.spring.ServiceBean;
+import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.spring.ServiceBean;
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
@@ -28,7 +28,6 @@
 /**
  * Dubbo {@link Service} Metadata {@link Endpoint}
  *
- *
  * @since 0.2.0
  */
 @Endpoint(id = "dubboservices")