polish #761 update pkg name & maven coordinate for Greenwich

spring-cloud-alibaba-dubbo/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -142,7 +142,7 @@
 
         <!-- Nacos Service Discovery -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <optional>true</optional>
         </dependency>

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.actuate;
+package com.alibaba.cloud.dubbo.actuate;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.alibaba.dubbo.actuate.endpoint.DubboRestMetadataEndpoint;
+import com.alibaba.cloud.dubbo.actuate.endpoint.DubboRestMetadataEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java

@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.actuate.endpoint;
+package com.alibaba.cloud.dubbo.actuate.endpoint;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataService;
+import com.alibaba.cloud.dubbo.service.DubboMetadataService;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.annotation;
+package com.alibaba.cloud.dubbo.annotation;
 
 import org.apache.dubbo.common.Constants;
 import org.apache.dubbo.config.annotation.Reference;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.SmartInitializingSingleton;
@@ -25,13 +25,13 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.client.loadbalancer.DubboMetadataInitializerInterceptor;
-import org.springframework.cloud.alibaba.dubbo.client.loadbalancer.DubboTransporterInterceptor;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboTransportedAttributesResolver;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.client.loadbalancer.DubboMetadataInitializerInterceptor;
+import com.alibaba.cloud.dubbo.client.loadbalancer.DubboTransporterInterceptor;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.resolver.DubboTransportedAttributesResolver;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
 import org.springframework.cloud.client.loadbalancer.RestTemplateCustomizer;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
 
 import org.apache.dubbo.config.ProtocolConfig;
 import org.apache.dubbo.config.spring.ServiceBean;
@@ -25,15 +25,15 @@ import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.event.ApplicationFailedEvent;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboProtocolConfigSupplier;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboServiceBeanMetadataResolver;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.MetadataResolver;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceExporter;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.service.IntrospectiveDubboMetadataService;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.DubboProtocolConfigSupplier;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.resolver.DubboServiceBeanMetadataResolver;
+import com.alibaba.cloud.dubbo.metadata.resolver.MetadataResolver;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceExporter;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.service.IntrospectiveDubboMetadataService;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java

@@ -14,19 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
+
+import com.alibaba.cloud.dubbo.openfeign.TargeterBeanPostProcessor;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.openfeign.TargeterBeanPostProcessor;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
 
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java

@@ -14,18 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
+
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.service.parameter.PathVariableServiceParameterResolver;
+import com.alibaba.cloud.dubbo.service.parameter.RequestBodyServiceParameterResolver;
+import com.alibaba.cloud.dubbo.service.parameter.RequestHeaderServiceParameterResolver;
+import com.alibaba.cloud.dubbo.service.parameter.RequestParamServiceParameterResolver;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.dubbo.env.DubboCloudProperties;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.PathVariableServiceParameterResolver;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestBodyServiceParameterResolver;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestHeaderServiceParameterResolver;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestParamServiceParameterResolver;
+import com.alibaba.cloud.dubbo.env.DubboCloudProperties;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
 
 import org.apache.dubbo.config.RegistryConfig;
 import org.apache.dubbo.config.spring.ServiceBean;
@@ -32,10 +32,10 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.dubbo.autoconfigure.condition.MissingSpringCloudRegistryConfigPropertyCondition;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.registry.DubboServiceRegistrationEventPublishingAspect;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
+import com.alibaba.cloud.dubbo.autoconfigure.condition.MissingSpringCloudRegistryConfigPropertyCondition;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.registry.DubboServiceRegistrationEventPublishingAspect;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.consul.serviceregistry.ConsulRegistration;
@@ -53,10 +53,10 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.EUREKA_AUTO_CONFIGURATION_CLASS_NAME;
-import static org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory.ADDRESS;
-import static org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.EUREKA_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.ADDRESS;
+import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
 import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.config.spring.ServiceBean;
@@ -30,8 +30,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
@@ -43,8 +43,8 @@ import org.springframework.context.event.EventListener;
 
 import java.util.List;
 
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.ZOOKEEPER_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.ZOOKEEPER_AUTO_CONFIGURATION_CLASS_NAME;
 
 /**
  * Dubbo Service Registration Auto-{@link Configuration} for Non-Web application

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure.condition;
+package com.alibaba.cloud.dubbo.autoconfigure.condition;
 
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistry;
+import com.alibaba.cloud.dubbo.registry.SpringCloudRegistry;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -28,7 +28,7 @@ import org.springframework.util.StringUtils;
 import java.util.Map;
 
 import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getSubProperties;
-import static org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
+import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
 
 /**
  * Missing {@link SpringCloudRegistry} Property {@link Condition}

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponse.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.client.loadbalancer;
 
 import org.apache.dubbo.rpc.service.GenericException;
 import org.springframework.http.HttpHeaders;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.client.loadbalancer;
 
 import org.apache.dubbo.rpc.service.GenericException;
-import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
-import org.springframework.cloud.alibaba.dubbo.http.util.HttpMessageConverterResolver;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.converter.HttpMessageConverterHolder;
+import com.alibaba.cloud.dubbo.http.util.HttpMessageConverterResolver;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.converter.HttpMessageConverter;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboHttpOutputMessage.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.client.loadbalancer;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpOutputMessage;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.client.loadbalancer;
 
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboTransporterInterceptor.java

@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.client.loadbalancer;
 
 import org.apache.dubbo.rpc.service.GenericException;
 import org.apache.dubbo.rpc.service.GenericService;
 
-import org.springframework.cloud.alibaba.dubbo.http.MutableHttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContext;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.http.MutableHttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.context;
+package com.alibaba.cloud.dubbo.context;
 
-import org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory;
+import com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.env;
+package com.alibaba.cloud.dubbo.env;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.env;
+package com.alibaba.cloud.dubbo.env;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
 
 import org.apache.dubbo.common.io.UnsafeByteArrayInputStream;
 import org.springframework.http.HttpHeaders;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/HttpServerRequest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
 
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpRequest;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
@@ -27,7 +27,7 @@ import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.getParameters;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.getParameters;
 
 /**
  * Mutable {@link HttpServerRequest} implementation

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.converter;
+package com.alibaba.cloud.dubbo.http.converter;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java

@@ -0,0 +1,76 @@
+/*
+ * 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.cloud.dubbo.http.matcher;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Abstract {@link HttpRequestMatcher} implementation
+ *
+ * @author Rossen Stoyanchev
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ */
+public abstract class AbstractHttpRequestMatcher implements HttpRequestMatcher {
+
+	/**
+	 * Return the discrete items a request condition is composed of.
+	 * <p>
+	 * For example URL patterns, HTTP request methods, param expressions, etc.
+	 *
+	 * @return a collection of objects, never {@code null}
+	 */
+	protected abstract Collection<?> getContent();
+
+	/**
+	 * The notation to use when printing discrete items of content.
+	 * <p>
+	 * For example {@code " || "} for URL patterns or {@code " && "} for param
+	 * expressions.
+	 */
+	protected abstract String getToStringInfix();
+
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (other == null || getClass() != other.getClass()) {
+			return false;
+		}
+		return getContent().equals(((AbstractHttpRequestMatcher) other).getContent());
+	}
+
+	@Override
+	public int hashCode() {
+		return getContent().hashCode();
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder("[");
+		for (Iterator<?> iterator = getContent().iterator(); iterator.hasNext();) {
+			Object expression = iterator.next();
+			builder.append(expression.toString());
+			if (iterator.hasNext()) {
+				builder.append(getToStringInfix());
+			}
+		}
+		builder.append("]");
+		return builder.toString();
+	}
+}

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.MediaType;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.util.ObjectUtils;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpRequest;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.MediaType;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java

@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
-import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpRequest;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.util.CollectionUtils;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.util.AntPathMatcher;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.MediaType;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ObjectUtils;
 
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.getParameters;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.getParameters;
 
 /**
  * Parses and matches a single param expression to a request.

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.springframework.http.MediaType;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
 
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.toNameAndValues;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.toNameAndValues;
 
 /**
  * {@link RequestMetadata} {@link HttpRequestMatcher} implementation

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.util;
+package com.alibaba.cloud.dubbo.http.util;
 
-import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.converter.HttpMessageConverterHolder;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.util;
+package com.alibaba.cloud.dubbo.http.util;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.util.LinkedMultiValueMap;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import org.apache.dubbo.config.ProtocolConfig;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import java.util.Objects;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
 
 import java.lang.reflect.Method;
 import java.util.List;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -37,7 +37,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.SortedMap;
 
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.normalizePath;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.normalizePath;
 import static org.springframework.http.MediaType.parseMediaTypes;
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata.repository;
+package com.alibaba.cloud.dubbo.metadata.repository;
 
 import org.apache.dubbo.common.URL;
 
@@ -24,15 +24,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.alibaba.dubbo.env.DubboCloudProperties;
-import org.springframework.cloud.alibaba.dubbo.http.matcher.RequestMetadataMatcher;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataService;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceExporter;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.env.DubboCloudProperties;
+import com.alibaba.cloud.dubbo.http.matcher.RequestMetadataMatcher;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.service.DubboMetadataService;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceExporter;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.commons.util.InetUtils;
@@ -63,8 +63,8 @@ import static java.util.Collections.unmodifiableMap;
 import static java.util.Collections.unmodifiableSet;
 import static org.apache.dubbo.common.Constants.APPLICATION_KEY;
 import static org.apache.dubbo.common.Constants.VERSION_KEY;
-import static org.springframework.cloud.alibaba.dubbo.env.DubboCloudProperties.ALL_DUBBO_SERVICES;
-import static org.springframework.cloud.alibaba.dubbo.http.DefaultHttpRequest.builder;
+import static com.alibaba.cloud.dubbo.env.DubboCloudProperties.ALL_DUBBO_SERVICES;
+import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder;
 import static org.springframework.util.CollectionUtils.isEmpty;
 import static org.springframework.util.StringUtils.hasText;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
 
 import feign.Contract;
 import feign.Feign;
@@ -26,8 +26,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
 import org.springframework.util.ClassUtils;
 
 import java.lang.reflect.Method;
@@ -171,7 +171,7 @@ public class DubboServiceBeanMetadataResolver implements BeanClassLoaderAware, S
         String configKey = methodMetadata.configKey();
         Method feignContractMethod = getMatchedFeignContractMethod(targetType, feignContractMethods, configKey);
         RestMethodMetadata metadata = new RestMethodMetadata(methodMetadata);
-        metadata.setMethod(new org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata(feignContractMethod));
+        metadata.setMethod(new com.alibaba.cloud.dubbo.metadata.MethodMetadata(feignContractMethod));
         return metadata;
     }
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
 
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
 import org.springframework.core.env.PropertyResolver;
 
 import java.util.LinkedHashMap;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
 
 import feign.Contract;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.metadata.DubboTransportedMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.MethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.env.PropertyResolver;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
 
 import org.apache.dubbo.config.spring.ServiceBean;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
 
 import java.util.Set;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
 
 import org.apache.dubbo.rpc.service.GenericService;
 
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContext;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
 import org.springframework.util.ClassUtils;
 
 import java.lang.reflect.InvocationHandler;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
 
 import org.apache.dubbo.rpc.service.GenericService;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
 
 import java.lang.reflect.Method;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java

@@ -14,18 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
+
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+
 import org.springframework.core.env.Environment;
 
 import static java.lang.reflect.Proxy.newProxyInstance;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
 import static org.springframework.util.ClassUtils.getUserClass;
 import static org.springframework.util.ClassUtils.isPresent;
 import static org.springframework.util.ClassUtils.resolveClassName;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
 
 
 import org.apache.dubbo.rpc.service.GenericService;
@@ -23,16 +23,16 @@ import feign.Contract;
 import feign.Target;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboTransportedMethodMetadataResolver;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.DubboTransportedMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.MethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.resolver.DubboTransportedMethodMetadataResolver;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
 import org.springframework.cloud.openfeign.FeignContext;
 import org.springframework.core.env.Environment;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
 
 import org.apache.dubbo.common.Constants;
 import org.apache.dubbo.common.URL;
@@ -24,10 +24,10 @@ import org.apache.dubbo.registry.support.FailbackRegistry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataService;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboMetadataService;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
 
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstanceRegisteredEvent;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstanceRegisteredEvent;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 import org.springframework.context.ApplicationEventPublisher;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.registry.RegistryFactory;
 
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 
 import java.util.concurrent.ScheduledExecutorService;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java

@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.utils.NamedThreadFactory;
 import org.apache.dubbo.registry.Registry;
 import org.apache.dubbo.registry.RegistryFactory;
 
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.context.ConfigurableApplicationContext;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.registry.event;
+package com.alibaba.cloud.dubbo.registry.event;
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.registry.event;
+package com.alibaba.cloud.dubbo.registry.event;
 
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.apache.dubbo.rpc.service.GenericService;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.DubboGenericServiceParameterResolver;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.MethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.service.parameter.DubboGenericServiceParameterResolver;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 import javax.annotation.PostConstruct;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.utils.CollectionUtils;
@@ -28,8 +28,8 @@ import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.DataBinder;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataService.java

@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.config.annotation.Service;
 
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
 
 import java.util.List;
 import java.util.Map;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.config.ApplicationConfig;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.apache.dubbo.rpc.service.GenericService;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.DisposableBean;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
 
 import org.apache.dubbo.common.URL;
 
@@ -22,9 +22,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
 
 import java.util.Collections;
 import java.util.HashMap;

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java

@@ -14,70 +14,69 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
+
+import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
+import static org.springframework.util.ClassUtils.resolveClassName;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.format.support.FormattingConversionService;
-
-import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
-import static org.springframework.util.ClassUtils.resolveClassName;
 
 /**
  * Abstract {@link DubboGenericServiceParameterResolver} implementation
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  */
-public abstract class AbstractDubboGenericServiceParameterResolver implements DubboGenericServiceParameterResolver,
-        BeanClassLoaderAware {
+public abstract class AbstractDubboGenericServiceParameterResolver
+		implements DubboGenericServiceParameterResolver, BeanClassLoaderAware {
 
-    private int order;
+	private int order;
 
-    @Autowired(required = false)
-    @Qualifier(CONVERSION_SERVICE_BEAN_NAME)
-    private ConversionService conversionService = new DefaultFormattingConversionService();
+	@Autowired(required = false)
+	@Qualifier(CONVERSION_SERVICE_BEAN_NAME)
+	private ConversionService conversionService = new DefaultFormattingConversionService();
 
-    private ClassLoader classLoader;
+	private ClassLoader classLoader;
 
-    public ConversionService getConversionService() {
-        return conversionService;
-    }
+	public ConversionService getConversionService() {
+		return conversionService;
+	}
 
-    public void setConversionService(ConversionService conversionService) {
-        this.conversionService = conversionService;
-    }
+	public void setConversionService(ConversionService conversionService) {
+		this.conversionService = conversionService;
+	}
 
-    public ClassLoader getClassLoader() {
-        return classLoader;
-    }
+	public ClassLoader getClassLoader() {
+		return classLoader;
+	}
 
-    @Override
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        this.classLoader = classLoader;
-    }
+	@Override
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+	}
 
-    public void setOrder(int order) {
-        this.order = order;
-    }
+	public void setOrder(int order) {
+		this.order = order;
+	}
 
-    @Override
-    public int getOrder() {
-        return order;
-    }
+	@Override
+	public int getOrder() {
+		return order;
+	}
 
-    protected Class<?> resolveClass(String className) {
-        return resolveClassName(className, classLoader);
-    }
+	protected Class<?> resolveClass(String className) {
+		return resolveClassName(className, classLoader);
+	}
 
-    protected Object resolveValue(Object parameterValue, String parameterType) {
-        Class<?> targetType = resolveClass(parameterType);
-        return resolveValue(parameterValue, targetType);
-    }
+	protected Object resolveValue(Object parameterValue, String parameterType) {
+		Class<?> targetType = resolveClass(parameterType);
+		return resolveValue(parameterValue, targetType);
+	}
 
-    protected Object resolveValue(Object parameterValue, Class<?> parameterType) {
-        return conversionService.convert(parameterValue, parameterType);
-    }
+	protected Object resolveValue(Object parameterValue, Class<?> parameterType) {
+		return conversionService.convert(parameterValue, parameterType);
+	}
 }

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
 
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MultiValueMap;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java

@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
+
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
 
 import org.apache.dubbo.rpc.service.GenericService;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
 import org.springframework.core.Ordered;
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
 
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
 import org.springframework.util.MultiValueMap;
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java

@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
-import org.springframework.cloud.alibaba.dubbo.http.util.HttpMessageConverterResolver;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.converter.HttpMessageConverterHolder;
+import com.alibaba.cloud.dubbo.http.util.HttpMessageConverterResolver;
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
 
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
 import org.springframework.util.MultiValueMap;
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
 
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
 import org.springframework.util.MultiValueMap;
 
 /**

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/util/JSONUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.util;
+package com.alibaba.cloud.dubbo.util;
 
 import org.apache.dubbo.common.URL;
 

spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcher.java

@@ -1,74 +0,0 @@
-/*
- * 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.springframework.cloud.alibaba.dubbo.http.matcher;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * Abstract {@link HttpRequestMatcher} implementation
- *
- * @author Rossen Stoyanchev
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- */
-public abstract class AbstractHttpRequestMatcher implements HttpRequestMatcher {
-
-    /**
-     * Return the discrete items a request condition is composed of.
-     * <p>For example URL patterns, HTTP request methods, param expressions, etc.
-     *
-     * @return a collection of objects, never {@code null}
-     */
-    protected abstract Collection<?> getContent();
-
-    /**
-     * The notation to use when printing discrete items of content.
-     * <p>For example {@code " || "} for URL patterns or {@code " && "}
-     * for param expressions.
-     */
-    protected abstract String getToStringInfix();
-
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) {
-            return true;
-        }
-        if (other == null || getClass() != other.getClass()) {
-            return false;
-        }
-        return getContent().equals(((AbstractHttpRequestMatcher) other).getContent());
-    }
-
-    @Override
-    public int hashCode() {
-        return getContent().hashCode();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder("[");
-        for (Iterator<?> iterator = getContent().iterator(); iterator.hasNext(); ) {
-            Object expression = iterator.next();
-            builder.append(expression.toString());
-            if (iterator.hasNext()) {
-                builder.append(getToStringInfix());
-            }
-        }
-        builder.append("]");
-        return builder.toString();
-    }
-}

spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory

@@ -1 +1 @@
-spring-cloud=org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory
+spring-cloud=com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory

spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories

@@ -1,16 +1,16 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboMetadataAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationNonWebApplicationAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboLoadBalancedRestTemplateAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceAutoConfiguration
+com.alibaba.cloud.dubbo.autoconfigure.DubboMetadataAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationNonWebApplicationAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboLoadBalancedRestTemplateAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboServiceAutoConfiguration
 
 org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration=\
-org.springframework.cloud.alibaba.dubbo.actuate.DubboMetadataEndpointAutoConfiguration
+com.alibaba.cloud.dubbo.actuate.DubboMetadataEndpointAutoConfiguration
 
 org.springframework.context.ApplicationContextInitializer=\
-org.springframework.cloud.alibaba.dubbo.context.DubboServiceRegistrationApplicationContextInitializer
+com.alibaba.cloud.dubbo.context.DubboServiceRegistrationApplicationContextInitializer
 
 org.springframework.boot.env.EnvironmentPostProcessor=\
-org.springframework.cloud.alibaba.dubbo.env.DubboNonWebApplicationEnvironmentPostProcessor
+com.alibaba.cloud.dubbo.env.DubboNonWebApplicationEnvironmentPostProcessor

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
 
 import org.springframework.boot.test.context.SpringBootTest;
 

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Test;
 
@@ -25,13 +25,13 @@ import org.junit.Test;
  */
 public abstract class AbstractHttpRequestMatcherTest<T extends AbstractHttpRequestMatcher> {
 
-    @Test
-    public abstract void testEqualsAndHashCode();
+	@Test
+	public abstract void testEqualsAndHashCode();
 
-    @Test
-    public abstract void testGetContent();
+	@Test
+	public abstract void testGetContent();
 
-    @Test
-    public abstract void testGetToStringInfix();
+	@Test
+	public abstract void testGetToStringInfix();
 
 }

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.http.HttpRequest;
 
-import static org.springframework.cloud.alibaba.dubbo.http.DefaultHttpRequest.builder;
+import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder;
 
 /**
  * {@link HeaderExpression} Test

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.springframework.http.HttpMethod;

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java

@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 
 import java.net.URI;
-import java.util.List;
-import java.util.Map;
 
 /**
  * {@link HttpRequestParamsMatcher} Test

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.http.HttpRequest;
 
-import static org.springframework.cloud.alibaba.dubbo.http.DefaultHttpRequest.builder;
+import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder;
 
 /**
  * {@link ParamExpression} Test

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.http.util;
+package com.alibaba.cloud.dubbo.http.util;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.metadata.DubboTransportedMethodMetadata;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.mock.env.MockEnvironment;