study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Polish alibaba/spring-cloud-alibaba#1363 : Sync spring-cloud-starter-dubbo module

Browse Source
This commit is contained in:
mercyblitz 2020-04-14 13:45:22 +08:00
parent 787b529f7c
commit 0da36b8b2e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
View File

@ -190,7 +190,7 @@ public class DubboServiceMetadataRepository
// // // //
private static <K, V> Map<K, V> getMap(Map<String, Map<K, V>> repository, private static <K, V> Map<K, V> getMap(Map<String, Map<K, V>> repository,
String key) { String key) {
return getOrDefault(repository, key, newHashMap()); return getOrDefault(repository, key, newHashMap());
} }
@ -343,7 +343,7 @@ public class DubboServiceMetadataRepository
} }
private void addDubboMetadataServiceURLsMetadata(Map<String, String> metadata, private void addDubboMetadataServiceURLsMetadata(Map<String, String> metadata,
List<URL> dubboMetadataServiceURLs) { List<URL> dubboMetadataServiceURLs) {
String dubboMetadataServiceURLsJSON = jsonUtils.toJSON(dubboMetadataServiceURLs); String dubboMetadataServiceURLsJSON = jsonUtils.toJSON(dubboMetadataServiceURLs);
metadata.put(DUBBO_METADATA_SERVICE_URLS_PROPERTY_NAME, metadata.put(DUBBO_METADATA_SERVICE_URLS_PROPERTY_NAME,
dubboMetadataServiceURLsJSON); dubboMetadataServiceURLsJSON);
@ -390,7 +390,7 @@ public class DubboServiceMetadataRepository
} }
public List<URL> findSubscribedDubboMetadataServiceURLs(String serviceName, public List<URL> findSubscribedDubboMetadataServiceURLs(String serviceName,
String group, String version, String protocol) { String group, String version, String protocol) {
String serviceKey = URL.buildKey(serviceName, group, version); String serviceKey = URL.buildKey(serviceName, group, version);
List<URL> urls = null; List<URL> urls = null;
@ -403,9 +403,11 @@ public class DubboServiceMetadataRepository
return emptyList(); return emptyList();
} }
return hasText(protocol) ? urls.stream() return hasText(protocol)
.filter(url -> url.getProtocol().equalsIgnoreCase(protocol)) ? urls.stream()
.collect(Collectors.toList()) : unmodifiableList(urls); .filter(url -> url.getProtocol().equalsIgnoreCase(protocol))
.collect(Collectors.toList())
: unmodifiableList(urls);
} }
/** /**
@ -470,7 +472,7 @@ public class DubboServiceMetadataRepository
} }
public Integer getDubboProtocolPort(ServiceInstance serviceInstance, public Integer getDubboProtocolPort(ServiceInstance serviceInstance,
String protocol) { String protocol) {
String protocolProperty = getDubboProtocolPropertyName(protocol); String protocolProperty = getDubboProtocolPropertyName(protocol);
Map<String, String> metadata = serviceInstance.getMetadata(); Map<String, String> metadata = serviceInstance.getMetadata();
String protocolPort = metadata.get(protocolProperty); String protocolPort = metadata.get(protocolProperty);
@ -478,7 +480,7 @@ public class DubboServiceMetadataRepository
} }
public List<URL> getExportedURLs(String serviceInterface, String group, public List<URL> getExportedURLs(String serviceInterface, String group,
String version) { String version) {
String serviceKey = URL.buildKey(serviceInterface, group, version); String serviceKey = URL.buildKey(serviceInterface, group, version);
return allExportedURLs.getOrDefault(serviceKey, Collections.emptyList()); return allExportedURLs.getOrDefault(serviceKey, Collections.emptyList());
} }
@ -535,7 +537,7 @@ public class DubboServiceMetadataRepository
* @return {@link DubboRestServiceMetadata} if matched, or <code>null</code> * @return {@link DubboRestServiceMetadata} if matched, or <code>null</code>
*/ */
public DubboRestServiceMetadata get(String serviceName, public DubboRestServiceMetadata get(String serviceName,
RequestMetadata requestMetadata) { RequestMetadata requestMetadata) {
return match(dubboRestServiceMetadataRepository, serviceName, requestMetadata); return match(dubboRestServiceMetadataRepository, serviceName, requestMetadata);
} }
@ -552,7 +554,7 @@ public class DubboServiceMetadataRepository
} }
private <T> T match(Map<String, Map<RequestMetadataMatcher, T>> repository, private <T> T match(Map<String, Map<RequestMetadataMatcher, T>> repository,
String serviceName, RequestMetadata requestMetadata) { String serviceName, RequestMetadata requestMetadata) {
Map<RequestMetadataMatcher, T> map = repository.get(serviceName); Map<RequestMetadataMatcher, T> map = repository.get(serviceName);