remove collections and move lowercase map to MapUtils

HSGamer · Feb 23, 2025 · 4c1c1e1 · 4c1c1e1
1 parent 1cadb2f
commit 4c1c1e1
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 164 deletions.
diff --git a/collections/pom.xml b/collections/pom.xml
diff --git a/...ections/src/main/java/me/hsgamer/hscore/collections/map/CaseInsensitiveStringHashMap.java b/...ections/src/main/java/me/hsgamer/hscore/collections/map/CaseInsensitiveStringHashMap.java
diff --git a/...tions/src/main/java/me/hsgamer/hscore/collections/map/CaseInsensitiveStringLinkedMap.java b/...tions/src/main/java/me/hsgamer/hscore/collections/map/CaseInsensitiveStringLinkedMap.java
diff --git a/collections/src/main/java/me/hsgamer/hscore/collections/map/CaseInsensitiveStringMap.java b/collections/src/main/java/me/hsgamer/hscore/collections/map/CaseInsensitiveStringMap.java
diff --git a/collections/src/main/java/me/hsgamer/hscore/collections/map/package-info.java b/collections/src/main/java/me/hsgamer/hscore/collections/map/package-info.java
diff --git a/common/src/main/java/me/hsgamer/hscore/common/MapUtils.java b/common/src/main/java/me/hsgamer/hscore/common/MapUtils.java
@@ -1,9 +1,7 @@
 package me.hsgamer.hscore.common;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.function.Supplier;
 
 /**
  * Methods on Map
@@ -121,4 +119,32 @@ public static Optional<Map<String, Object>> castOptionalStringObjectMap(Object o
   public static Optional<Map<String, Object>> castOptionalStringObjectMap(Object object) {
     return castOptionalStringObjectMap(object, true);
   }
+
+  /**
+   * Create a new map with lowercase keys
+   *
+   * @param map         the map
+   * @param mapSupplier the map constructor
+   * @param <V>         the value type
+   * @param <M>         the map type
+   *
+   * @return the new map
+   */
+  public static <V, M extends Map<String, V>> M createLowercaseStringMap(Map<String, V> map, Supplier<M> mapSupplier) {
+    M newMap = mapSupplier.get();
+    map.forEach((k, v) -> newMap.put(k.toLowerCase(Locale.ROOT), v));
+    return newMap;
+  }
+
+  /**
+   * Create a {@link LinkedHashMap} with lowercase keys
+   *
+   * @param map the map
+   * @param <V> the value type
+   *
+   * @return the new map
+   */
+  public static <V> Map<String, V> createLowercaseStringMap(Map<String, V> map) {
+    return createLowercaseStringMap(map, LinkedHashMap::new);
+  }
 }
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,6 @@
     <module>extra</module>
     <module>variable</module>
     <module>builder</module>
-    <module>collections</module>
     <module>web</module>
     <module>request</module>
     <module>serializer</module>