(yegor256#1384) Fill new map at construction

andreoss · Sep 15, 2020 · 0c4db78 · 0c4db78
1 parent 41ce82e
commit 0c4db78
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/src/main/java/org/cactoos/map/MapOf.java b/src/main/java/org/cactoos/map/MapOf.java
@@ -23,7 +23,6 @@
  */
 package org.cactoos.map;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.cactoos.Func;
@@ -147,23 +146,20 @@ public MapOf(final Map<X, Y> src,
 
     /**
      * Ctor.
-     * @param entries List of the entries
+     * @param scalar The scalar for Map.
      */
-    public MapOf(final Iterable<Map.Entry<X, Y>> entries) {
-        this(() -> {
-            final Map<X, Y> temp = new HashMap<>(0);
-            for (final Map.Entry<X, Y> entry : entries) {
-                temp.put(entry.getKey(), entry.getValue());
-            }
-            return Collections.unmodifiableMap(temp);
-        });
+    public MapOf(final Scalar<Map<X, Y>> scalar) {
+        this(new Unchecked<>(scalar).value().entrySet());
     }
 
     /**
      * Ctor.
-     * @param scalar The scalar for Map.
+     * @param entries List of the entries
      */
-    public MapOf(final Scalar<Map<X, Y>> scalar) {
-        super(new Unchecked<>(scalar).value());
+    public MapOf(final Iterable<Map.Entry<X, Y>> entries) {
+        super(new HashMap<>());
+        for (final Map.Entry<X, Y> entry : entries) {
+            this.put(entry.getKey(), entry.getValue());
+        }
     }
 }