From ce97a57ce29eca44bdbc14d596ff34dc622b2a85 Mon Sep 17 00:00:00 2001 From: "Craig P. Motlin" Date: Tue, 12 Apr 2022 08:17:41 -0400 Subject: [PATCH] Replace FastList.newList(iterable) with Lists.mutable.withAll(). --- .idea/inspectionProfiles/IDE.xml | 4 ++++ .../impl/collection/mutable/CollectionAdapter.java | 4 ++-- .../collections/impl/list/mutable/AbstractMutableList.java | 4 ++-- .../eclipse/collections/impl/list/mutable/ListAdapter.java | 4 ++-- .../collections/impl/list/mutable/MutableListFactoryImpl.java | 1 + .../impl/list/mutable/RandomAccessListAdapter.java | 2 +- .../java/org/eclipse/collections/impl/utility/Iterate.java | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.idea/inspectionProfiles/IDE.xml b/.idea/inspectionProfiles/IDE.xml index f4cec71060..d04ec767a7 100644 --- a/.idea/inspectionProfiles/IDE.xml +++ b/.idea/inspectionProfiles/IDE.xml @@ -648,6 +648,10 @@ + + + + diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/CollectionAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/CollectionAdapter.java index d615d10a92..3397c5fb12 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/CollectionAdapter.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/collection/mutable/CollectionAdapter.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. @@ -117,7 +117,7 @@ public static MutableList wrapList(Iterable iterable) { return ListAdapter.adapt((List) iterable); } - return FastList.newList(iterable); + return Lists.mutable.withAll(iterable); } public static MutableCollection adapt(Collection collection) diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/AbstractMutableList.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/AbstractMutableList.java index f44dc5d6d8..81771f4e3d 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/AbstractMutableList.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/AbstractMutableList.java @@ -670,12 +670,12 @@ protected SubList(AbstractMutableList list, int fromIndex, int toIndex) @Override public MutableList toReversed() { - return FastList.newList(this).reverseThis(); + return Lists.mutable.withAll(this).reverseThis(); } protected Object writeReplace() { - return FastList.newList(this); + return Lists.mutable.withAll(this); } @Override diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/ListAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/ListAdapter.java index 1e14dff9bd..204a62e5d6 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/ListAdapter.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/ListAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Goldman Sachs and others. + * 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. @@ -106,7 +106,7 @@ public MutableList asSynchronized() @Override public MutableList clone() { - return FastList.newList(this.delegate); + return Lists.mutable.withAll(this.delegate); } /** diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MutableListFactoryImpl.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MutableListFactoryImpl.java index 978ff2878d..7734093a5f 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MutableListFactoryImpl.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MutableListFactoryImpl.java @@ -54,6 +54,7 @@ public MutableList withInitialCapacity(int capacity) @Override public MutableList withAll(Iterable iterable) { + //noinspection SSBasedInspection return FastList.newList(iterable); } diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/RandomAccessListAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/RandomAccessListAdapter.java index 42ab61b810..94baac6ac9 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/RandomAccessListAdapter.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/RandomAccessListAdapter.java @@ -118,7 +118,7 @@ public MutableList asSynchronized() @Override public MutableList clone() { - return FastList.newList(this.delegate); + return Lists.mutable.withAll(this.delegate); } /** diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java index 848eb382c6..8e8fc95b53 100644 --- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java +++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/utility/Iterate.java @@ -3195,7 +3195,7 @@ public static > MutableList toSortedList(Iter */ public static MutableList toSortedList(Iterable iterable, Comparator comparator) { - return FastList.newList(iterable).sortThis(comparator); + return Lists.mutable.withAll(iterable).sortThis(comparator); } /**