code cleanup; remove now obsolete LangUtil.map() method

xzel23 · Dec 8, 2023 · 91bd540 · 91bd540
1 parent d64e082
commit 91bd540
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/utility/src/main/java/com/dua3/utility/lang/LangUtil.java b/utility/src/main/java/com/dua3/utility/lang/LangUtil.java
@@ -360,8 +360,8 @@ public static String trimWithByteOrderMark(String s) {
      * @param items the key-value pairs to put into the map
      */
     @SafeVarargs
-    public static <K, V> void putAllIfAbsent(Map<? super K, ? super V> map, Pair<K, V>... items) {
-        Arrays.stream(items).forEach(item -> map.putIfAbsent(item.first(), item.second()));
+    public static <K, V> void putAllIfAbsent(Map<? super K, ? super V> map, Map.Entry<K, V>... items) {
+        Arrays.stream(items).forEach(item -> map.putIfAbsent(item.getKey(), item.getValue()));
     }
 
     /**
@@ -373,23 +373,8 @@ public static <K, V> void putAllIfAbsent(Map<? super K, ? super V> map, Pair<K,
      * @param items the key-value pairs to put into the map
      */
     @SafeVarargs
-    public static <K, V> void putAll(Map<? super K, ? super V> map, Pair<K, V>... items) {
-        Arrays.stream(items).forEach(item -> map.put(item.first(), item.second()));
-    }
-
-    /**
-     * Create an unmodifiable map from key-value pairs.
-     *
-     * @param <K>   the key type
-     * @param <V>   the value type
-     * @param items the key-value pairs to put into the map
-     * @return unmodifiable map
-     */
-    @SafeVarargs
-    public static <K, V> Map<K, V> map(Pair<K, V>... items) {
-        Map<K, V> map = new HashMap<>();
-        putAllIfAbsent(map, items);
-        return Collections.unmodifiableMap(map);
+    public static <K, V> void putAll(Map<? super K, ? super V> map, Map.Entry<K, V>... items) {
+        Arrays.stream(items).forEach(item -> map.put(item.getKey(), item.getValue()));
     }
 
     /**

diff --git a/utility/src/test/java/com/dua3/utility/lang/LangUtilTest.java b/utility/src/test/java/com/dua3/utility/lang/LangUtilTest.java
@@ -161,18 +161,6 @@ void putAll() {
         assertEquals(expected, map);
     }
 
-    @Test
-    void map() {
-        Map<Integer, String> map = LangUtil.map(Pair.of(1, "a"), Pair.of(3, "c"), Pair.of(2, "b"));
-
-        Map<Integer, String> expected = new HashMap<>();
-        expected.put(1, "a");
-        expected.put(2, "b");
-        expected.put(3, "c");
-
-        assertEquals(expected, map);
-    }
-
     @SuppressWarnings("ZeroLengthArrayAllocation")
     @Test
     void testEquals() {