mirror of
https://gitee.com/mirrors/Spring-Cloud-Alibaba.git
synced 2021-06-26 13:25:11 +08:00
Merge pull request #923 from liuxx001/master
another way to customize getting service instance in service subscribe and fixes #908.
This commit is contained in:
commit
101ac4c605
@ -16,8 +16,10 @@
|
|||||||
package com.alibaba.cloud.dubbo.autoconfigure;
|
package com.alibaba.cloud.dubbo.autoconfigure;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
import com.alibaba.cloud.dubbo.metadata.repository.MetadataServiceInstanceSelector;
|
||||||
import org.apache.dubbo.config.ProtocolConfig;
|
import org.apache.dubbo.config.ProtocolConfig;
|
||||||
import org.apache.dubbo.config.spring.ServiceBean;
|
import org.apache.dubbo.config.spring.ServiceBean;
|
||||||
import org.apache.dubbo.config.spring.context.event.ServiceBeanExportedEvent;
|
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 com.alibaba.cloud.dubbo.util.JSONUtils;
|
||||||
|
|
||||||
import feign.Contract;
|
import feign.Contract;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Boot Auto-Configuration class for Dubbo Metadata
|
* Spring Boot Auto-Configuration class for Dubbo Metadata
|
||||||
@ -68,6 +71,15 @@ public class DubboMetadataAutoConfiguration {
|
|||||||
return new DubboServiceBeanMetadataResolver(contract);
|
return new DubboServiceBeanMetadataResolver(contract);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnMissingBean
|
||||||
|
public MetadataServiceInstanceSelector metadataServiceInstanceSelector() {
|
||||||
|
return serviceInstances ->
|
||||||
|
CollectionUtils.isEmpty(serviceInstances)
|
||||||
|
? Optional.empty()
|
||||||
|
: serviceInstances.stream().findAny();
|
||||||
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public Supplier<ProtocolConfig> dubboProtocolConfigSupplier(
|
public Supplier<ProtocolConfig> dubboProtocolConfigSupplier(
|
||||||
ObjectProvider<Collection<ProtocolConfig>> protocols) {
|
ObjectProvider<Collection<ProtocolConfig>> protocols) {
|
||||||
|
@ -165,6 +165,9 @@ public class DubboServiceMetadataRepository
|
|||||||
@Autowired
|
@Autowired
|
||||||
private DiscoveryClient discoveryClient;
|
private DiscoveryClient discoveryClient;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private MetadataServiceInstanceSelector metadataServiceInstanceSelector;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private JSONUtils jsonUtils;
|
private JSONUtils jsonUtils;
|
||||||
|
|
||||||
@ -618,7 +621,7 @@ public class DubboServiceMetadataRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void initSubscribedDubboMetadataService(String serviceName) {
|
protected void initSubscribedDubboMetadataService(String serviceName) {
|
||||||
discoveryClient.getInstances(serviceName).stream().findAny()
|
metadataServiceInstanceSelector.choose(discoveryClient.getInstances(serviceName))
|
||||||
.map(this::getDubboMetadataServiceURLs)
|
.map(this::getDubboMetadataServiceURLs)
|
||||||
.ifPresent(dubboMetadataServiceURLs -> {
|
.ifPresent(dubboMetadataServiceURLs -> {
|
||||||
dubboMetadataServiceURLs.forEach(dubboMetadataServiceURL -> {
|
dubboMetadataServiceURLs.forEach(dubboMetadataServiceURL -> {
|
||||||
|
@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* 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;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* metadata service instance selector
|
||||||
|
*
|
||||||
|
* @author <a href="mailto:liuxx-u@outlook.com">liuxx</a>
|
||||||
|
*/
|
||||||
|
public interface MetadataServiceInstanceSelector {
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* choose a service instance to get metadata
|
||||||
|
* @param serviceInstances all service instance
|
||||||
|
* @return the service instance to get metadata
|
||||||
|
*/
|
||||||
|
Optional<ServiceInstance> choose(List<ServiceInstance> serviceInstances);
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user