From 40bbb1551e6d647a15bfeede0ea6b34084959ddb Mon Sep 17 00:00:00 2001
From: "Craig P. Motlin" <cmotlin@gmail.com>
Date: Mon, 18 Apr 2022 18:49:00 -0400
Subject: [PATCH] Replace TreeSortedMap.newMap() with
 SortedMaps.mutable.empty().

Signed-off-by: Craig P. Motlin <cmotlin@gmail.com>
---
 .idea/inspectionProfiles/IDE.xml                               | 3 +++
 .../collections/impl/bag/immutable/ImmutableEmptyBag.java      | 3 ++-
 .../eclipse/collections/impl/bag/sorted/mutable/TreeBag.java   | 3 ++-
 .../impl/map/sorted/mutable/MutableSortedMapFactoryImpl.java   | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.idea/inspectionProfiles/IDE.xml b/.idea/inspectionProfiles/IDE.xml
index b0a2abd949..7d76999611 100644
--- a/.idea/inspectionProfiles/IDE.xml
+++ b/.idea/inspectionProfiles/IDE.xml
@@ -672,6 +672,9 @@
         <constraint name="__context__" within="" contains="" />
         <constraint name="iterable" nameOfExprType="Iterable" exprTypeWithinHierarchy="true" within="" contains="" />
       </replaceConfiguration>
+      <replaceConfiguration name="TreeSortedMap.newMap() to SortedMaps.mutable.empty()" text="org.eclipse.collections.impl.map.sorted.mutable.TreeSortedMap.newMap()" recursive="false" caseInsensitive="false" type="JAVA" pattern_context="default" reformatAccordingToStyle="false" shortenFQN="true" replacement="org.eclipse.collections.api.factory.SortedMaps.mutable.empty()">
+        <constraint name="__context__" within="" contains="" />
+      </replaceConfiguration>
       <replaceConfiguration name="TreeSortedSet.newSet(comparator, iterable) to SortedSets.mutable.withAll(comparator, iterable)" text="org.eclipse.collections.impl.set.sorted.mutable.TreeSortedSet.newSet($comparator$, $iterable$)" recursive="false" caseInsensitive="false" type="JAVA" pattern_context="default" reformatAccordingToStyle="false" shortenFQN="true" replacement="org.eclipse.collections.api.factory.SortedSets.mutable.withAll($comparator$, $iterable$)">
         <constraint name="__context__" within="" contains="" />
         <constraint name="iterable" nameOfExprType="Iterable" exprTypeWithinHierarchy="true" within="" contains="" />
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableEmptyBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableEmptyBag.java
index 0388176979..6090d779ce 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableEmptyBag.java
+++ b/eclipse-collections/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/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/TreeBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/TreeBag.java
index 1af39529fe..888c8b03bc 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/TreeBag.java
+++ b/eclipse-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/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/MutableSortedMapFactoryImpl.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/MutableSortedMapFactoryImpl.java
index 5e3074af90..682253eed7 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/MutableSortedMapFactoryImpl.java
+++ b/eclipse-collections/src/main/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();
     }