patricklaux · patricklaux · Jul 5, 2024 · Jul 5, 2024
diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ mvn clean install
 
 | 版本   | 说明                                                         |
 | ------ | ------------------------------------------------------------ |
+| 1.0.11 | 1. 添加 ConcurrentHashSet <br />2. 添加 PlatformThreadFactory<br />3. 添加 VirtualThreadFactory<br />4. 升级为支持 JDK 21，不再支持 JDK 17 |
 | 1.0.10 | 1. 添加 SimpleJSON（仅实现对象转 JSONString）<br />2. 升级为支持 JDK 17，不再支持 JDK 8 |
 | 1.0.9  | 1. 添加 RandomUtils                                          |
 | 1.0.8  | 1. 添加 Maps.newHashMap方法                                  |

diff --git a/docs/Reference.md b/docs/Reference.md
@@ -865,6 +865,115 @@ public class ArrayUtilsTest {
 }
 ```
 
+### 4.4. Sets
+
+主要用于创建 Set
+
+```java
+class SetsTest {
+
+    /**
+     * 创建 HashSet
+     */
+    @Test
+    public void newHashSet() {
+        HashSet<String> set = Sets.newHashSet();
+        Assertions.assertEquals(0, set.size());
+    }
+
+    /**
+     * 使用期望容量创建 HashSet
+     */
+    @Test
+    public void testNewHashSet() {
+        HashSet<String> set = Sets.newHashSet(8);
+        Assertions.assertEquals(0, set.size());
+    }
+
+    /**
+     * 集合对象转换为 HashSet
+     */
+    @Test
+    public void testNewHashSet1() {
+        int size = 5;
+        ArrayList<Integer> list = getArrayList(size);
+        HashSet<Integer> set = Sets.newHashSet(list);
+        Assertions.assertEquals(size, set.size());
+    }
+
+    /**
+     * 创建 LinkedHashSet
+     */
+    @Test
+    public void newLinkedHashSet() {
+        LinkedHashSet<String> set = Sets.newLinkedHashSet();
+        Assertions.assertEquals(0, set.size());
+    }
+
+    /**
+     * 使用期望容量创建 LinkedHashSet
+     */
+    @Test
+    public void testNewLinkedHashSet() {
+        LinkedHashSet<String> set = Sets.newLinkedHashSet(8);
+        Assertions.assertEquals(0, set.size());
+    }
+
+    /**
+     * 集合对象转换为 LinkedHashSet
+     */
+    @Test
+    public void testNewLinkedHashSet1() {
+        int size = 5;
+        ArrayList<Integer> list = getArrayList(size);
+        LinkedHashSet<Integer> set = Sets.newLinkedHashSet(list);
+        Assertions.assertEquals(size, set.size());
+    }
+
+    /**
+     * 创建 ConcurrentHashSet
+     */
+    @Test
+    void newConcurrentHashSet() {
+        ConcurrentHashSet<String> set = Sets.newConcurrentHashSet();
+        Assertions.assertEquals(0, set.size());
+    }
+
+    /**
+     * 使用期望容量创建 ConcurrentHashSet
+     */
+    @Test
+    void testNewConcurrentHashSet() {
+        ConcurrentHashSet<String> set = Sets.newConcurrentHashSet(1);
+        Assertions.assertEquals(0, set.size());
+    }
+
+    /**
+     * 集合对象转换为 LinkedHashSet
+     */
+    @Test
+    void testNewConcurrentHashSet1() {
+        int size = 5;
+        ArrayList<Integer> list = getArrayList(size);
+        ConcurrentHashSet<Integer> set = Sets.newConcurrentHashSet(list);
+        Assertions.assertEquals(size, set.size());
+    }
+
+    private static ArrayList<Integer> getArrayList(int size) {
+        ArrayList<Integer> list = new ArrayList<>(size);
+        for (int i = 0; i < size; i++) {
+            list.add(i);
+        }
+        return list;
+    }
+
+}
+```
+
+### 4.5. ConcurrentHashSet
+
+类似于 HashSet 的实现，底层使用 ConcurrentHashMap 作为存储。
+
 ## 5. 安全工具类
 
 ### 5.1. DigestUtils
@@ -2356,3 +2465,8 @@ class SimpleJSONTest {
 }
 ```
 
+## 10. 线程与并发
+
+PlatformThreadFactory：平台线程池
+
+VirtualThreadFactory：虚拟线程池
diff --git a/src/main/java/com/igeeksky/xtool/core/collection/ConcurrentHashSet.java b/src/main/java/com/igeeksky/xtool/core/collection/ConcurrentHashSet.java
@@ -1,16 +1,22 @@
 package com.igeeksky.xtool.core.collection;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 /**
  * @author Patrick.Lau
  * @since 1.0.0 2024/7/1
  */
-public class ConcurrentHashSet<E> extends AbstractSet<E> {
+public class ConcurrentHashSet<E> extends AbstractSet<E> implements Serializable {
 
-    private final ConcurrentMap<E, Boolean> delegate;
+    @Serial
+    private static final long serialVersionUID = 8822098000974922850L;
+
+    private static final Object PRESENT = new Object();
+
+    private final transient ConcurrentHashMap<E, Object> delegate;
 
     public ConcurrentHashSet() {
         this.delegate = new ConcurrentHashMap<>();
@@ -65,19 +71,24 @@ public <T> T[] toArray(T[] a) {
 
     @Override
     public boolean add(E e) {
-        return this.delegate.put(e, Boolean.TRUE) == null;
+        return this.delegate.put(e, PRESENT) == null;
     }
 
     @Override
     public boolean remove(Object o) {
         return this.delegate.remove(o) != null;
     }
 
+    @Override
+    public Spliterator<E> spliterator() {
+        return this.delegate.keySet().spliterator();
+    }
+
     @Override
     public boolean retainAll(Collection<?> c) {
         Objects.requireNonNull(c);
         boolean modified = false;
-        Iterator<Map.Entry<E, Boolean>> it = this.delegate.entrySet().iterator();
+        Iterator<Map.Entry<E, Object>> it = this.delegate.entrySet().iterator();
         while (it.hasNext()) {
             if (!c.contains(it.next().getKey())) {
                 it.remove();

diff --git a/src/test/java/com/igeeksky/xtool/core/collection/SetsTest.java b/src/test/java/com/igeeksky/xtool/core/collection/SetsTest.java
@@ -13,18 +13,27 @@
  */
 class SetsTest {
 
+    /**
+     * 创建 HashSet
+     */
     @Test
     public void newHashSet() {
         HashSet<String> set = Sets.newHashSet();
         Assertions.assertEquals(0, set.size());
     }
 
+    /**
+     * 使用期望容量创建 HashSet
+     */
     @Test
     public void testNewHashSet() {
         HashSet<String> set = Sets.newHashSet(8);
         Assertions.assertEquals(0, set.size());
     }
 
+    /**
+     * 集合对象转换为 HashSet
+     */
     @Test
     public void testNewHashSet1() {
         int size = 5;
@@ -33,18 +42,27 @@ public void testNewHashSet1() {
         Assertions.assertEquals(size, set.size());
     }
 
+    /**
+     * 创建 LinkedHashSet
+     */
     @Test
     public void newLinkedHashSet() {
         LinkedHashSet<String> set = Sets.newLinkedHashSet();
         Assertions.assertEquals(0, set.size());
     }
 
+    /**
+     * 使用期望容量创建 LinkedHashSet
+     */
     @Test
     public void testNewLinkedHashSet() {
         LinkedHashSet<String> set = Sets.newLinkedHashSet(8);
         Assertions.assertEquals(0, set.size());
     }
 
+    /**
+     * 集合对象转换为 LinkedHashSet
+     */
     @Test
     public void testNewLinkedHashSet1() {
         int size = 5;
@@ -53,18 +71,27 @@ public void testNewLinkedHashSet1() {
         Assertions.assertEquals(size, set.size());
     }
 
+    /**
+     * 创建 ConcurrentHashSet
+     */
     @Test
     void newConcurrentHashSet() {
         ConcurrentHashSet<String> set = Sets.newConcurrentHashSet();
         Assertions.assertEquals(0, set.size());
     }
 
+    /**
+     * 使用期望容量创建 ConcurrentHashSet
+     */
     @Test
     void testNewConcurrentHashSet() {
         ConcurrentHashSet<String> set = Sets.newConcurrentHashSet(1);
         Assertions.assertEquals(0, set.size());
     }
 
+    /**
+     * 集合对象转换为 LinkedHashSet
+     */
     @Test
     void testNewConcurrentHashSet1() {
         int size = 5;

diff --git a/src/test/java/com/igeeksky/xtool/core/concurrent/PlatformThreadFactoryTest.java b/src/test/java/com/igeeksky/xtool/core/concurrent/PlatformThreadFactoryTest.java
@@ -11,6 +11,9 @@ class PlatformThreadFactoryTest {
 
     private static final PlatformThreadFactory threadFactory = new PlatformThreadFactory("platform-thread-");
 
+    /**
+     * 创建新线程
+     */
     @Test
     void newThread() {
         for (int i = 0; i < 10; i++) {