Replace TreeSortedMap.newMap() with SortedMaps.mutable.empty().

Signed-off-by: Craig P. Motlin <cmotlin@gmail.com>
eclipse · Apr 19, 2022 · 40bbb15 · 40bbb15
1 parent 69f9563
commit 40bbb15
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.idea/inspectionProfiles/IDE.xml b/.idea/inspectionProfiles/IDE.xml
diff --git a/...llections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableEmptyBag.java b/...llections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableEmptyBag.java
@@ -58,6 +58,7 @@
 import org.eclipse.collections.api.factory.Maps;
 import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.factory.SortedBags;
+import org.eclipse.collections.api.factory.SortedMaps;
 import org.eclipse.collections.api.factory.primitive.BooleanBags;
 import org.eclipse.collections.api.factory.primitive.ByteBags;
 import org.eclipse.collections.api.factory.primitive.CharBags;
@@ -630,7 +631,7 @@ public <NK, NV> MutableSortedMap<NK, NV> toSortedMap(
             Function<? super T, ? extends NK> keyFunction,
             Function<? super T, ? extends NV> valueFunction)
     {
-        return TreeSortedMap.newMap();
+        return SortedMaps.mutable.empty();
     }
 
     @Override

diff --git a/...se-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/TreeBag.java b/...se-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/TreeBag.java
@@ -32,6 +32,7 @@
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.block.procedure.Procedure2;
 import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure;
+import org.eclipse.collections.api.factory.SortedMaps;
 import org.eclipse.collections.api.factory.SortedSets;
 import org.eclipse.collections.api.map.sorted.MutableSortedMap;
 import org.eclipse.collections.api.ordered.OrderedIterable;
@@ -67,7 +68,7 @@ public class TreeBag<T>
 
     public TreeBag()
     {
-        this.items = TreeSortedMap.newMap();
+        this.items = SortedMaps.mutable.empty();
     }
 
     private TreeBag(MutableSortedMap<T, Counter> map)

diff --git a/...ain/java/org/eclipse/collections/impl/map/sorted/mutable/MutableSortedMapFactoryImpl.java b/...ain/java/org/eclipse/collections/impl/map/sorted/mutable/MutableSortedMapFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -23,6 +23,7 @@ public class MutableSortedMapFactoryImpl implements MutableSortedMapFactory
     @Override
     public <K, V> MutableSortedMap<K, V> empty()
     {
+        //noinspection SSBasedInspection
         return TreeSortedMap.newMap();
     }