This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch master-hsf in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 3dedd37ab2fb2838e6930346e346438b3c23d870 Author: cvictory <[email protected]> AuthorDate: Mon Nov 4 13:44:46 2019 +0800 online and offline --- .../java/org/apache/dubbo/common/ServiceDescriptor.java | 16 ++++++++-------- .../java/org/apache/dubbo/qos/command/impl/Offline.java | 2 +- .../java/org/apache/dubbo/qos/command/impl/Online.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceDescriptor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceDescriptor.java index c072141..19433d8 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceDescriptor.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceDescriptor.java @@ -26,7 +26,7 @@ public class ServiceDescriptor { } /** - * Format : interface:version:group + * Format : interface:version * * @return */ @@ -34,24 +34,24 @@ public class ServiceDescriptor { StringBuilder serviceNameBuilder = new StringBuilder(); serviceNameBuilder.append(serviceInterfaceName); serviceNameBuilder.append(COLON_SEPERATOR).append(version); - serviceNameBuilder.append(COLON_SEPERATOR).append(group); return serviceNameBuilder.toString(); } + /** + * revert of org.apache.dubbo.common.ServiceDescriptor#getDisplayServiceKey() + * @param displayKey + * @return + */ public static ServiceDescriptor revertDisplayServiceKey(String displayKey) { String[] eles = StringUtils.split(displayKey, COLON_SEPERATOR); - if (eles == null || eles.length < 1 || eles.length > 3) { + if (eles == null || eles.length < 1 || eles.length > 2) { return new ServiceDescriptor(); } ServiceDescriptor serviceDescriptor = new ServiceDescriptor(); serviceDescriptor.setServiceInterfaceName(eles[0]); - if (eles.length > 1) { + if (eles.length == 2) { serviceDescriptor.setVersion(eles[1]); } - if (eles.length == 3) { - serviceDescriptor.setGroup(eles[2]); - } - return serviceDescriptor; } diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java index c44cc41..8e1c63b 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java @@ -60,7 +60,7 @@ public class Offline implements BaseCommand { boolean hasService = false; Collection<ProviderModel> providerModelList = ApplicationModel.allProviderModels(); for (ProviderModel providerModel : providerModelList) { - if (providerModel.getServiceName().matches(servicePattern)) { + if (providerModel.getServiceMetadata().getDisplayServiceKey().matches(servicePattern)) { hasService = true; Set<ProviderInvokerWrapper> providerInvokerWrapperSet = ProviderConsumerRegTable .getProviderInvoker(providerModel.getServiceMetadata().getServiceKey()); diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java index c72098f..cb62647 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java @@ -46,7 +46,7 @@ public class Online implements BaseCommand { logger.info("receive online command"); String servicePattern = ".*"; if (ArrayUtils.isNotEmpty(args)) { - servicePattern = args[0]; + servicePattern = "" + args[0]; } boolean hasService = online(servicePattern); @@ -63,7 +63,7 @@ public class Online implements BaseCommand { boolean hasService = false; Collection<ProviderModel> providerModelList = ApplicationModel.allProviderModels(); for (ProviderModel providerModel : providerModelList) { - if (providerModel.getServiceName().matches(servicePattern)) { + if (providerModel.getServiceMetadata().getDisplayServiceKey().matches(servicePattern)) { hasService = true; Set<ProviderInvokerWrapper> providerInvokerWrapperSet = ProviderConsumerRegTable.getProviderInvoker(providerModel.getServiceMetadata().getServiceKey()); for (ProviderInvokerWrapper providerInvokerWrapper : providerInvokerWrapperSet) {
