From a5a64f9b1a002c4faefb85ea6cb7b113594b77ca Mon Sep 17 00:00:00 2001
From: bubu <1654388696@qq.com>
Date: Tue, 2 Jun 2026 16:55:17 +0800
Subject: [PATCH 1/2] Improve type safety of CollectionUtils.toTreeSet

Fixes #16297
---
 .../dubbo/common/utils/CollectionUtils.java   | 11 +++++-
 .../common/utils/CollectionUtilsTest.java     | 36 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CollectionUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CollectionUtils.java
index 9544dbeeec4..3817a1f9de9 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CollectionUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CollectionUtils.java
@@ -419,7 +419,7 @@ public static <T> T first(List<T> values) {
         return values.get(0);
     }
 
-    public static <T> Set<T> toTreeSet(Set<T> set) {
+    public static <T extends Comparable<? super T>> Set<T> toTreeSet(Set<T> set) {
         if (isEmpty(set)) {
             return set;
         }
@@ -429,6 +429,15 @@ public static <T> Set<T> toTreeSet(Set<T> set) {
         return set;
     }
 
+    public static <T> Set<T> toTreeSet(Set<T> set, Comparator<? super T> comparator) {
+        if (set == null) {
+            return set;
+        }
+        Set<T> treeSet = new TreeSet<>(comparator);
+        treeSet.addAll(set);
+        return treeSet;
+    }
+
     public static <T> Set<T> newHashSet(int expectedSize) {
         return new HashSet<>(capacity(expectedSize));
     }
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java
index be48654d2d6..0f4a889f6c6 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java
@@ -21,12 +21,14 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -255,6 +257,27 @@ void sortShouldSupportComparableSuperType() {
         assertEquals("b", sorted.get(1).getName());
     }
 
+    @Test
+    void toTreeSetShouldSupportExplicitComparator() {
+        Set<PriorityItem> items = new LinkedHashSet<>(Arrays.asList(new PriorityItem(3), new PriorityItem(1)));
+
+        Set<PriorityItem> sorted = CollectionUtils.toTreeSet(items, Comparator.comparingInt(PriorityItem::getPriority));
+
+        List<PriorityItem> sortedList = new ArrayList<>(sorted);
+        assertEquals(1, sortedList.get(0).getPriority());
+        assertEquals(3, sortedList.get(1).getPriority());
+    }
+
+    @Test
+    void toTreeSetShouldPreserveComparatorForEmptyInput() {
+        Comparator<PriorityItem> comparator = Comparator.comparingInt(PriorityItem::getPriority);
+
+        Set<PriorityItem> sorted = CollectionUtils.toTreeSet(new LinkedHashSet<>(), comparator);
+
+        assertTrue(sorted instanceof TreeSet);
+        Assertions.assertSame(comparator, ((TreeSet<PriorityItem>) sorted).comparator());
+    }
+
     private static class Person implements Comparable<Person> {
 
         private final String name;
@@ -279,4 +302,17 @@ private Student(String name) {
             super(name);
         }
     }
+
+    private static class PriorityItem {
+
+        private final int priority;
+
+        private PriorityItem(int priority) {
+            this.priority = priority;
+        }
+
+        private int getPriority() {
+            return priority;
+        }
+    }
 }

From 630215ff94588e3dfe8ee6bb0caf8cc55688ebc2 Mon Sep 17 00:00:00 2001
From: bubu <1654388696@qq.com>
Date: Wed, 3 Jun 2026 14:45:22 +0800
Subject: [PATCH 2/2] Add null coverage for toTreeSet comparator overload

---
 .../org/apache/dubbo/common/utils/CollectionUtilsTest.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java
index 0f4a889f6c6..20d801a3676 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java
@@ -278,6 +278,13 @@ void toTreeSetShouldPreserveComparatorForEmptyInput() {
         Assertions.assertSame(comparator, ((TreeSet<PriorityItem>) sorted).comparator());
     }
 
+    @Test
+    void toTreeSetShouldReturnNullForNullInputWithComparator() {
+        Comparator<PriorityItem> comparator = Comparator.comparingInt(PriorityItem::getPriority);
+
+        assertNull(CollectionUtils.toTreeSet(null, comparator));
+    }
+
     private static class Person implements Comparable<Person> {
 
         private final String name;