From 13fc8e40b51ed1cd5a1fb10d717091597a9a37cc Mon Sep 17 00:00:00 2001
From: ZhouXY108 <luquanlion@outlook.com>
Date: Tue, 27 Jun 2023 01:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/util/AbstractMapWrapper.java      | 35 +++++++++++++------
 .../plusone/commons/util/MapWrapper.java      |  2 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/AbstractMapWrapper.java b/src/main/java/xyz/zhouxy/plusone/commons/util/AbstractMapWrapper.java
index dea4355..31623e5 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/AbstractMapWrapper.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/AbstractMapWrapper.java
@@ -70,10 +70,25 @@ public abstract class AbstractMapWrapper<K, V, T extends AbstractMapWrapper<K, V
      * @throws IllegalArgumentException key 不存在时抛出。
      */
     public Optional<V> get(K key) {
-        if (this.map.containsKey(key)) {
-            return Optional.ofNullable(this.map.get(key));
+        if (!this.map.containsKey(key)) {
+            throw new IllegalArgumentException("Key does not exist");
         }
-        throw new IllegalArgumentException("Key does not exist");
+        return Optional.ofNullable(this.map.get(key));
+    }
+
+    /**
+     * 获取 {@code map} 中的值。如果 {@code key} 不存在，则抛出异常。
+     *
+     * @param key 键
+     * @return 值
+     * @throws IllegalArgumentException key 不存在时抛出。
+     */
+    @Nullable
+    public V getOrNull(K key) {
+        if (!this.map.containsKey(key)) {
+            throw new IllegalArgumentException("Key does not exist");
+        }
+        return this.map.get(key);
     }
 
     @SuppressWarnings("unchecked")
@@ -149,7 +164,7 @@ public abstract class AbstractMapWrapper<K, V, T extends AbstractMapWrapper<K, V
         return this.map.toString();
     }
 
-    protected abstract static class Builder<K, V> {
+    protected abstract static class Builder<K, V, T extends AbstractMapWrapper<K, V, T>> {
         protected final Map<K, V> map;
         protected Consumer<K> keyChecker;
         protected Consumer<V> valueChecker;
@@ -158,17 +173,17 @@ public abstract class AbstractMapWrapper<K, V, T extends AbstractMapWrapper<K, V
             this.map = map;
         }
 
-        public Builder<K, V> keyChecker(@Nullable Consumer<K> keyChecker) {
+        public Builder<K, V, T> keyChecker(@Nullable Consumer<K> keyChecker) {
             this.keyChecker = keyChecker;
             return this;
         }
 
-        public Builder<K, V> valueChecker(@Nullable Consumer<V> valueChecker) {
+        public Builder<K, V, T> valueChecker(@Nullable Consumer<V> valueChecker) {
             this.valueChecker = valueChecker;
             return this;
         }
 
-        public Builder<K, V> put(K key, V value) {
+        public Builder<K, V, T> put(K key, V value) {
             if (this.keyChecker != null) {
                 this.keyChecker.accept(key);
             }
@@ -179,15 +194,15 @@ public abstract class AbstractMapWrapper<K, V, T extends AbstractMapWrapper<K, V
             return this;
         }
 
-        public Builder<K, V> putAll(Map<? extends K, ? extends V> m) {
+        public Builder<K, V, T> putAll(Map<? extends K, ? extends V> m) {
             for (Entry<? extends K, ? extends V> entry : m.entrySet()) {
                 put(entry.getKey(), entry.getValue());
             }
             return this;
         }
 
-        public abstract MapWrapper<K, V> build();
+        public abstract T build();
 
-        public abstract MapWrapper<K, V> buildUnmodifiableMap();
+        public abstract T buildUnmodifiableMap();
     }
 }
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/MapWrapper.java b/src/main/java/xyz/zhouxy/plusone/commons/util/MapWrapper.java
index 62a936f..151b0a9 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/MapWrapper.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/MapWrapper.java
@@ -61,7 +61,7 @@ public final class MapWrapper<K, V> extends AbstractMapWrapper<K, V, MapWrapper<
         return new Builder<>(new TreeMap<>(comparator));
     }
 
-    public static final class Builder<K, V> extends AbstractMapWrapper.Builder<K, V> {
+    public static final class Builder<K, V> extends AbstractMapWrapper.Builder<K, V, MapWrapper<K, V>> {
 
         private Builder(Map<K, V> map) {
             super(map);