(dubbo) branch 3.3 updated: fix telnet list command, the service list is displayed unordered fix… (#14251)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.3 by this push:
     new bc83ae32c9  fix telnet list command, the service list is displayed 
unordered fix… (#14251)
bc83ae32c9 is described below

commit bc83ae32c99d25e8056675b0d8bd5d1216b99334
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Thu May 30 17:57:49 2024 +0800

     fix telnet list command, the service list is displayed unordered fix… 
(#14251)
    
    * fix telnet list command, the service list is displayed unordered fixes 
#14249
    
    * format code
    
    * remove useless code
    
    * remove useless code
---
 .../src/main/java/org/apache/dubbo/qos/command/impl/Ls.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git 
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
 
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
index b9043ecc5c..f4a49fbedb 100644
--- 
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
+++ 
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
@@ -26,6 +26,8 @@ import org.apache.dubbo.rpc.model.FrameworkModel;
 import org.apache.dubbo.rpc.model.ProviderModel;
 
 import java.util.Collection;
+import java.util.Comparator;
+import java.util.stream.Collectors;
 
 @Cmd(
         name = "ls",
@@ -53,6 +55,11 @@ public class Ls implements BaseCommand {
         Collection<ProviderModel> providerModelList =
                 frameworkModel.getServiceRepository().allProviderModels();
 
+        // Fix: Originally, providers were stored in ConcurrentHashMap, 
Disordered display of servicekey list
+        providerModelList = providerModelList.stream()
+                .sorted(Comparator.comparing(ProviderModel::getServiceKey))
+                .collect(Collectors.toList());
+
         TTable tTable = new TTable(new TTable.ColumnDefine[] {
             new TTable.ColumnDefine(TTable.Align.MIDDLE), new 
TTable.ColumnDefine(TTable.Align.MIDDLE)
         });
@@ -81,6 +88,11 @@ public class Ls implements BaseCommand {
         Collection<ConsumerModel> consumerModelList =
                 frameworkModel.getServiceRepository().allConsumerModels();
 
+        // Fix: Originally, consumers were stored in ConcurrentHashMap, 
Disordered display of servicekey list
+        consumerModelList = consumerModelList.stream()
+                .sorted(Comparator.comparing(ConsumerModel::getServiceKey))
+                .collect(Collectors.toList());
+
         TTable tTable = new TTable(new TTable.ColumnDefine[] {
             new TTable.ColumnDefine(TTable.Align.MIDDLE), new 
TTable.ColumnDefine(TTable.Align.MIDDLE)
         });