From 7dd7fa9c494dc261fc573b0b63a43f2077c760c8 Mon Sep 17 00:00:00 2001 From: liuxx <381334617@qq.com> Date: Sun, 8 Sep 2019 14:47:17 +0800 Subject: [PATCH 1/2] customize getting service instance in service subscribe. --- .../DubboMetadataAutoConfiguration.java | 12 ++++++++++ .../DubboServiceMetadataRepository.java | 5 +++- .../MetadataServiceInstanceSelector.java | 23 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java index c5dda73fb..6b71ce40c 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java @@ -16,8 +16,10 @@ package com.alibaba.cloud.dubbo.autoconfigure; import java.util.Collection; +import java.util.Optional; import java.util.function.Supplier; +import com.alibaba.cloud.dubbo.metadata.repository.MetadataServiceInstanceSelector; import org.apache.dubbo.config.ProtocolConfig; import org.apache.dubbo.config.spring.ServiceBean; import org.apache.dubbo.config.spring.context.event.ServiceBeanExportedEvent; @@ -42,6 +44,7 @@ import com.alibaba.cloud.dubbo.service.IntrospectiveDubboMetadataService; import com.alibaba.cloud.dubbo.util.JSONUtils; import feign.Contract; +import org.springframework.util.CollectionUtils; /** * Spring Boot Auto-Configuration class for Dubbo Metadata @@ -68,6 +71,15 @@ public class DubboMetadataAutoConfiguration { return new DubboServiceBeanMetadataResolver(contract); } + @Bean + @ConditionalOnMissingBean + public MetadataServiceInstanceSelector metadataServiceInstanceSelector() { + return serviceInstances -> + CollectionUtils.isEmpty(serviceInstances) + ? Optional.empty() + : serviceInstances.stream().findAny(); + } + @Bean public Supplier dubboProtocolConfigSupplier( ObjectProvider> protocols) { diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java index 032b1fae4..3afea1caf 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java @@ -165,6 +165,9 @@ public class DubboServiceMetadataRepository @Autowired private DiscoveryClient discoveryClient; + @Autowired + private MetadataServiceInstanceSelector metadataServiceInstanceSelector; + @Autowired private JSONUtils jsonUtils; @@ -618,7 +621,7 @@ public class DubboServiceMetadataRepository } protected void initSubscribedDubboMetadataService(String serviceName) { - discoveryClient.getInstances(serviceName).stream().findAny() + metadataServiceInstanceSelector.choose(discoveryClient.getInstances(serviceName)) .map(this::getDubboMetadataServiceURLs) .ifPresent(dubboMetadataServiceURLs -> { dubboMetadataServiceURLs.forEach(dubboMetadataServiceURL -> { diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java new file mode 100644 index 000000000..59abe6d57 --- /dev/null +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java @@ -0,0 +1,23 @@ +package com.alibaba.cloud.dubbo.metadata.repository; + +import org.springframework.cloud.client.ServiceInstance; + +import java.util.List; +import java.util.Optional; + +/** + * metadata service instance selector + * + * @author liuxx + * @date 2019/9/4 + */ +public interface MetadataServiceInstanceSelector { + + + /** + * choose a service instance to get metadata + * @param serviceInstances all service instance + * @return the service instance to get metadata + */ + Optional choose(List serviceInstances); +} From 379a8dc04a197c35ce4958bd30dbc22298f8fdfe Mon Sep 17 00:00:00 2001 From: liuxx Date: Wed, 11 Sep 2019 19:03:41 +0800 Subject: [PATCH 2/2] add license --- .../MetadataServiceInstanceSelector.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java index 59abe6d57..3bf1f4e87 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2018 the original author or authors. + * + * Licensed 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 + * + * https://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.metadata.repository; import org.springframework.cloud.client.ServiceInstance; @@ -8,8 +24,7 @@ import java.util.Optional; /** * metadata service instance selector * - * @author liuxx - * @date 2019/9/4 + * @author liuxx */ public interface MetadataServiceInstanceSelector {