Implement MutableOrderedMap.toImmutable(). Add ImmutableOrderedMapAda…

…pter.
eclipse · Sep 23, 2024 · d77af3b · d77af3b
1 parent a11c067
commit d77af3b
Show file tree

Hide file tree

Showing 5 changed files with 866 additions and 2 deletions.
diff --git a/...se-collections-api/src/main/java/org/eclipse/collections/api/map/ImmutableOrderedMap.java b/...se-collections-api/src/main/java/org/eclipse/collections/api/map/ImmutableOrderedMap.java
@@ -10,6 +10,8 @@
 
 package org.eclipse.collections.api.map;
 
+import java.util.Map;
+
 import org.eclipse.collections.api.block.function.Function;
 import org.eclipse.collections.api.block.function.Function0;
 import org.eclipse.collections.api.block.function.Function2;
@@ -34,12 +36,35 @@
 import org.eclipse.collections.api.list.primitive.ImmutableIntList;
 import org.eclipse.collections.api.list.primitive.ImmutableLongList;
 import org.eclipse.collections.api.list.primitive.ImmutableShortList;
+import org.eclipse.collections.api.map.primitive.ImmutableObjectDoubleMap;
+import org.eclipse.collections.api.map.primitive.ImmutableObjectLongMap;
 import org.eclipse.collections.api.multimap.list.ImmutableListMultimap;
 import org.eclipse.collections.api.partition.list.PartitionImmutableList;
 import org.eclipse.collections.api.tuple.Pair;
 
 public interface ImmutableOrderedMap<K, V> extends OrderedMap<K, V>, ImmutableMapIterable<K, V>
 {
+    @Override
+    ImmutableOrderedMap<K, V> newWithKeyValue(K key, V value);
+
+    @Override
+    ImmutableOrderedMap<K, V> newWithAllKeyValues(Iterable<? extends Pair<? extends K, ? extends V>> keyValues);
+
+    @Override
+    ImmutableOrderedMap<K, V> newWithMap(Map<? extends K, ? extends V> map);
+
+    @Override
+    ImmutableOrderedMap<K, V> newWithMapIterable(MapIterable<? extends K, ? extends V> mapIterable);
+
+    @Override
+    ImmutableOrderedMap<K, V> newWithAllKeyValueArguments(Pair<? extends K, ? extends V>... keyValuePairs);
+
+    @Override
+    ImmutableOrderedMap<K, V> newWithoutKey(K key);
+
+    @Override
+    ImmutableOrderedMap<K, V> newWithoutAllKeys(Iterable<? extends K> keys);
+
     @Override
     ImmutableOrderedMap<K, V> tap(Procedure<? super V> procedure);
 
@@ -183,4 +208,18 @@ default <K1, V1, V2> ImmutableOrderedMap<K1, V2> aggregateBy(
     <KK> ImmutableOrderedMap<KK, V> reduceBy(
             Function<? super V, ? extends KK> groupBy,
             Function2<? super V, ? super V, ? extends V> reduceFunction);
+
+    @Override
+    <VV> ImmutableObjectLongMap<VV> sumByInt(
+            Function<? super V, ? extends VV> groupBy,
+            IntFunction<? super V> function);
+
+    @Override
+    <VV> ImmutableObjectDoubleMap<VV> sumByFloat(Function<? super V, ? extends VV> groupBy, FloatFunction<? super V> function);
+
+    @Override
+    <VV> ImmutableObjectLongMap<VV> sumByLong(Function<? super V, ? extends VV> groupBy, LongFunction<? super V> function);
+
+    @Override
+    <VV> ImmutableObjectDoubleMap<VV> sumByDouble(Function<? super V, ? extends VV> groupBy, DoubleFunction<? super V> function);
 }
diff --git a/...ctions/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java b/...ctions/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java
@@ -102,7 +102,7 @@ public Map<K, V> castToMap()
     @Override
     public MutableMap<K, V> toMap()
     {
-        return UnifiedMap.newMap(this);
+        return Maps.mutable.withMap(this);
     }
 
     @Override