fix/738 Add missing methods to ImmutableMapFactory

eclipse · Oct 23, 2024 · d7329c3 · d7329c3
1 parent 538fff9
commit d7329c3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
@@ -39,7 +39,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
   <component name="SvnBranchConfigurationManager">

diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/...ctions-api/src/main/java/org/eclipse/collections/api/factory/map/ImmutableMapFactory.java b/...ctions-api/src/main/java/org/eclipse/collections/api/factory/map/ImmutableMapFactory.java
@@ -13,6 +13,8 @@
 import java.util.Map;
 
 import org.eclipse.collections.api.map.ImmutableMap;
+import org.eclipse.collections.api.map.MapIterable;
+import org.eclipse.collections.api.map.MutableMap;
 
 public interface ImmutableMapFactory
 {
@@ -67,4 +69,12 @@ public interface ImmutableMapFactory
     <K, V> ImmutableMap<K, V> ofAll(Map<? extends K, ? extends V> map);
 
     <K, V> ImmutableMap<K, V> withAll(Map<? extends K, ? extends V> map);
+
+    <K, V> MutableMap<K, V> withMap(Map<? extends K, ? extends V> map);
+
+    <K, V> MutableMap<K, V> ofMapIterable(MapIterable<? extends K, ? extends V> mapIterable);
+
+    <K, V> MutableMap<K, V> withMapIterable(MapIterable<? extends K, ? extends V> mapIterable);
+
+
 }
diff --git a/...ons/src/main/java/org/eclipse/collections/impl/map/immutable/ImmutableMapFactoryImpl.java b/...ons/src/main/java/org/eclipse/collections/impl/map/immutable/ImmutableMapFactoryImpl.java
@@ -13,8 +13,12 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.eclipse.collections.api.factory.Maps;
 import org.eclipse.collections.api.factory.map.ImmutableMapFactory;
 import org.eclipse.collections.api.map.ImmutableMap;
+import org.eclipse.collections.api.map.MapIterable;
+import org.eclipse.collections.api.map.MutableMap;
+import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 
 @aQute.bnd.annotation.spi.ServiceProvider(ImmutableMapFactory.class)
 public class ImmutableMapFactoryImpl implements ImmutableMapFactory
@@ -185,4 +189,24 @@ public <K, V> ImmutableMap<K, V> withAll(Map<? extends K, ? extends V> map)
                 throw new AssertionError();
         }
     }
+
+    @Override
+    public <K, V> MutableMap<K, V> withMap(Map<? extends K, ? extends V> map)
+    {
+        return UnifiedMap.newMap(map);
+    }
+
+    @Override
+    public <K, V> MutableMap<K, V> withMapIterable(MapIterable<? extends K, ? extends V> mapIterable)
+    {
+        MutableMap<K, V> output = Maps.mutable.withInitialCapacity(mapIterable.size());
+        mapIterable.forEachKeyValue(output::put);
+        return output;
+    }
+
+    @Override
+    public <K, V> MutableMap<K, V> ofMapIterable(MapIterable<? extends K, ? extends V> mapIterable)
+    {
+        return this.withMapIterable(mapIterable);
+    }
 }