From 9caa0f9742d78a9343c74b4a8bba5b096dfda91e Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Wed, 10 Apr 2019 23:54:13 +0800 Subject: [PATCH] Polish spring-cloud-incubator/spring-cloud-alibaba#542 : Rename DubboMetadataConfigService to DubboMetadataService --- .../endpoint/DubboRestMetadataEndpoint.java | 6 +++--- .../DubboMetadataAutoConfiguration.java | 20 +++++++++---------- .../DubboServiceMetadataRepository.java | 10 +++++----- ...Service.java => DubboMetadataService.java} | 4 ++-- ...java => DubboMetadataServiceExporter.java} | 20 +++++++++---------- ...ubboMetadataServiceInvocationHandler.java} | 10 +++++----- ...xy.java => DubboMetadataServiceProxy.java} | 16 +++++++-------- ...va => PublishingDubboMetadataService.java} | 4 ++-- 8 files changed, 45 insertions(+), 45 deletions(-) rename spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/{DubboMetadataConfigService.java => DubboMetadataService.java} (93%) rename spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/{DubboMetadataConfigServiceExporter.java => DubboMetadataServiceExporter.java} (82%) rename spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/{DubboMetadataConfigServiceInvocationHandler.java => DubboMetadataServiceInvocationHandler.java} (81%) rename spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/{DubboMetadataConfigServiceProxy.java => DubboMetadataServiceProxy.java} (66%) rename spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/{PublishingDubboMetadataConfigService.java => PublishingDubboMetadataService.java} (94%) diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java index c8bf0357..aa9234b0 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java @@ -19,7 +19,7 @@ package org.springframework.cloud.alibaba.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.DubboMetadataConfigService; +import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataService; import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @@ -30,10 +30,10 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; public class DubboRestMetadataEndpoint { @Autowired - private DubboMetadataConfigService dubboMetadataConfigService; + private DubboMetadataService dubboMetadataService; @ReadOperation(produces = APPLICATION_JSON_UTF8_VALUE) public String get() { - return dubboMetadataConfigService.getServiceRestMetadata(); + return dubboMetadataService.getServiceRestMetadata(); } } diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java index 94184b4b..331b6398 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java @@ -30,9 +30,9 @@ import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceM 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.DubboMetadataConfigServiceExporter; -import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataConfigServiceProxy; -import org.springframework.cloud.alibaba.dubbo.service.PublishingDubboMetadataConfigService; +import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceExporter; +import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy; +import org.springframework.cloud.alibaba.dubbo.service.PublishingDubboMetadataService; import org.springframework.cloud.alibaba.dubbo.util.JSONUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -50,19 +50,19 @@ import java.util.function.Supplier; */ @Configuration @Import({DubboServiceMetadataRepository.class, - PublishingDubboMetadataConfigService.class, - DubboMetadataConfigServiceExporter.class, + PublishingDubboMetadataService.class, + DubboMetadataServiceExporter.class, JSONUtils.class}) public class DubboMetadataAutoConfiguration { @Autowired - private PublishingDubboMetadataConfigService dubboMetadataConfigService; + private PublishingDubboMetadataService dubboMetadataService; @Autowired private MetadataResolver metadataResolver; @Autowired - private DubboMetadataConfigServiceExporter dubboMetadataConfigServiceExporter; + private DubboMetadataServiceExporter dubboMetadataConfigServiceExporter; @Bean @ConditionalOnMissingBean @@ -77,8 +77,8 @@ public class DubboMetadataAutoConfiguration { @Bean @ConditionalOnMissingBean - public DubboMetadataConfigServiceProxy dubboMetadataConfigServiceProxy(DubboGenericServiceFactory factory) { - return new DubboMetadataConfigServiceProxy(factory); + public DubboMetadataServiceProxy dubboMetadataConfigServiceProxy(DubboGenericServiceFactory factory) { + return new DubboMetadataServiceProxy(factory); } // Event-Handling @@ -101,7 +101,7 @@ public class DubboMetadataAutoConfiguration { } private void publishServiceRestMetadata(ServiceBean serviceBean) { - dubboMetadataConfigService.publishServiceRestMetadata(metadataResolver.resolveServiceRestMetadata(serviceBean)); + dubboMetadataService.publishServiceRestMetadata(metadataResolver.resolveServiceRestMetadata(serviceBean)); } private void exportDubboMetadataConfigService() { diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java index 53f86893..052dfa63 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java @@ -29,8 +29,8 @@ import org.springframework.cloud.alibaba.dubbo.http.matcher.RequestMetadataMatch 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.DubboMetadataConfigService; -import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataConfigServiceProxy; +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 org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; @@ -88,7 +88,7 @@ public class DubboServiceMetadataRepository { private DubboCloudProperties dubboCloudProperties; @Autowired - private DubboMetadataConfigServiceProxy dubboMetadataConfigServiceProxy; + private DubboMetadataServiceProxy dubboMetadataConfigServiceProxy; @Autowired private DiscoveryClient discoveryClient; @@ -255,11 +255,11 @@ public class DubboServiceMetadataRepository { } private Set getServiceRestMetadataSet(String serviceName) { - DubboMetadataConfigService dubboMetadataConfigService = dubboMetadataConfigServiceProxy.newProxy(serviceName); + DubboMetadataService dubboMetadataService = dubboMetadataConfigServiceProxy.newProxy(serviceName); Set metadata = Collections.emptySet(); try { - String serviceRestMetadataJsonConfig = dubboMetadataConfigService.getServiceRestMetadata(); + String serviceRestMetadataJsonConfig = dubboMetadataService.getServiceRestMetadata(); metadata = objectMapper.readValue(serviceRestMetadataJsonConfig, TypeFactory.defaultInstance().constructCollectionType(LinkedHashSet.class, ServiceRestMetadata.class)); } catch (Exception e) { diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigService.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java similarity index 93% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigService.java rename to spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java index b8443fb0..6e5afd16 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigService.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java @@ -21,11 +21,11 @@ import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata; import java.util.Set; /** - * Dubbo Metadata Configuration Service + * Dubbo Metadata Service * * @author Mercy */ -public interface DubboMetadataConfigService { +public interface DubboMetadataService { /** * Get The json content of {@link ServiceRestMetadata} {@link Set} diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceExporter.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java similarity index 82% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceExporter.java rename to spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java index a47d1895..fd51d708 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceExporter.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java @@ -30,12 +30,12 @@ import org.springframework.util.StringUtils; import java.util.function.Supplier; /** - * {@link DubboMetadataConfigService} exporter + * {@link DubboMetadataService} exporter * * @author Mercy */ @Component -public class DubboMetadataConfigServiceExporter { +public class DubboMetadataServiceExporter { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -43,7 +43,7 @@ public class DubboMetadataConfigServiceExporter { private ApplicationConfig applicationConfig; @Autowired - private PublishingDubboMetadataConfigService dubboMetadataConfigService; + private PublishingDubboMetadataService dubboMetadataService; @Autowired private Supplier protocolConfigSupplier; @@ -54,10 +54,10 @@ public class DubboMetadataConfigServiceExporter { /** * The ServiceConfig of DubboMetadataConfigService to be exported, can be nullable. */ - private ServiceConfig serviceConfig; + private ServiceConfig serviceConfig; /** - * export {@link DubboMetadataConfigService} as Dubbo service + * export {@link DubboMetadataService} as Dubbo service */ public void export() { @@ -65,21 +65,21 @@ public class DubboMetadataConfigServiceExporter { return; } - if (StringUtils.isEmpty(dubboMetadataConfigService.getServiceRestMetadata())) { + if (StringUtils.isEmpty(dubboMetadataService.getServiceRestMetadata())) { // If there is no REST metadata, DubboMetadataConfigService will not be exported. if (logger.isInfoEnabled()) { logger.info("There is no REST metadata, the Dubbo service[{}] will not be exported.", - dubboMetadataConfigService.getClass().getName()); + dubboMetadataService.getClass().getName()); } return; } serviceConfig = new ServiceConfig<>(); - serviceConfig.setInterface(DubboMetadataConfigService.class); + serviceConfig.setInterface(DubboMetadataService.class); // Use current Spring application name as the Dubbo Service version serviceConfig.setVersion(currentApplicationName); - serviceConfig.setRef(dubboMetadataConfigService); + serviceConfig.setRef(dubboMetadataService); serviceConfig.setApplication(applicationConfig); serviceConfig.setProtocol(protocolConfigSupplier.get()); @@ -92,7 +92,7 @@ public class DubboMetadataConfigServiceExporter { /** - * unexport {@link DubboMetadataConfigService} + * unexport {@link DubboMetadataService} */ public void unexport() { diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceInvocationHandler.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java similarity index 81% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceInvocationHandler.java rename to spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java index 8f354857..e4a7b24c 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceInvocationHandler.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java @@ -22,14 +22,14 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; /** - * {@link DubboMetadataConfigService} {@link InvocationHandler} + * {@link DubboMetadataService} {@link InvocationHandler} * * @author Mercy */ -class DubboMetadataConfigServiceInvocationHandler implements InvocationHandler { +class DubboMetadataServiceInvocationHandler implements InvocationHandler { /** - * The method name of {@link DubboMetadataConfigService#getServiceRestMetadata()} + * The method name of {@link DubboMetadataService#getServiceRestMetadata()} */ private static final String METHOD_NAME = "getServiceRestMetadata"; @@ -39,8 +39,8 @@ class DubboMetadataConfigServiceInvocationHandler implements InvocationHandler { private final GenericService genericService; - public DubboMetadataConfigServiceInvocationHandler(String serviceName, DubboGenericServiceFactory dubboGenericServiceFactory) { - this.genericService = dubboGenericServiceFactory.create(serviceName, DubboMetadataConfigService.class); + public DubboMetadataServiceInvocationHandler(String serviceName, DubboGenericServiceFactory dubboGenericServiceFactory) { + this.genericService = dubboGenericServiceFactory.create(serviceName, DubboMetadataService.class); } @Override diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceProxy.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java similarity index 66% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceProxy.java rename to spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java index 8db49572..660834e3 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataConfigServiceProxy.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java @@ -21,27 +21,27 @@ import org.springframework.beans.factory.BeanClassLoaderAware; import static java.lang.reflect.Proxy.newProxyInstance; /** - * The proxy of {@link DubboMetadataConfigService} + * The proxy of {@link DubboMetadataService} */ -public class DubboMetadataConfigServiceProxy implements BeanClassLoaderAware { +public class DubboMetadataServiceProxy implements BeanClassLoaderAware { private final DubboGenericServiceFactory dubboGenericServiceFactory; private ClassLoader classLoader; - public DubboMetadataConfigServiceProxy(DubboGenericServiceFactory dubboGenericServiceFactory) { + public DubboMetadataServiceProxy(DubboGenericServiceFactory dubboGenericServiceFactory) { this.dubboGenericServiceFactory = dubboGenericServiceFactory; } /** - * New proxy instance of {@link DubboMetadataConfigService} via the specified service name + * New proxy instance of {@link DubboMetadataService} via the specified service name * * @param serviceName the service name - * @return a {@link DubboMetadataConfigService} proxy + * @return a {@link DubboMetadataService} proxy */ - public DubboMetadataConfigService newProxy(String serviceName) { - return (DubboMetadataConfigService) newProxyInstance(classLoader, new Class[]{DubboMetadataConfigService.class}, - new DubboMetadataConfigServiceInvocationHandler(serviceName, dubboGenericServiceFactory)); + public DubboMetadataService newProxy(String serviceName) { + return (DubboMetadataService) newProxyInstance(classLoader, new Class[]{DubboMetadataService.class}, + new DubboMetadataServiceInvocationHandler(serviceName, dubboGenericServiceFactory)); } @Override diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/PublishingDubboMetadataConfigService.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/PublishingDubboMetadataService.java similarity index 94% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/PublishingDubboMetadataConfigService.java rename to spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/PublishingDubboMetadataService.java index 76fe660f..6fef49c7 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/PublishingDubboMetadataConfigService.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/PublishingDubboMetadataService.java @@ -27,11 +27,11 @@ import java.util.Set; import static org.springframework.util.ObjectUtils.isEmpty; /** - * Publishing {@link DubboMetadataConfigService} implementation + * Publishing {@link DubboMetadataService} implementation * * @author Mercy */ -public class PublishingDubboMetadataConfigService implements DubboMetadataConfigService { +public class PublishingDubboMetadataService implements DubboMetadataService { /** * A Map to store REST metadata temporary, its' key is the special service name for a Dubbo service,