Skip to content

Commit 7c167af

Browse files
danieldietrichdanieldietrich
authored
Removed deprecated removeAll and reject methods. Use filter and filterNot instead. (#2668)
1 parent 427994c commit 7c167af

37 files changed

+0
-888
lines changed

‎src/main/java/io/vavr/collection/AbstractMultimap.java

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,6 @@ public M filterNot(Predicate<? super Tuple2<K, V>> predicate) {
259259
return filter(predicate.negate());
260260
}
261261

262-
@Deprecated
263-
@Override
264-
public M reject(Predicate<? super Tuple2<K, V>> predicate) {
265-
Objects.requireNonNull(predicate, "predicate is null");
266-
return filter(predicate.negate());
267-
}
268-
269262
@Override
270263
public M filter(BiPredicate<? super K, ? super V> predicate) {
271264
Objects.requireNonNull(predicate, "predicate is null");
@@ -278,13 +271,6 @@ public M filterNot(BiPredicate<? super K, ? super V> predicate) {
278271
return filterNot(t -> predicate.test(t._1, t._2));
279272
}
280273

281-
@Deprecated
282-
@Override
283-
public M reject(BiPredicate<? super K, ? super V> predicate) {
284-
Objects.requireNonNull(predicate, "predicate is null");
285-
return reject(t -> predicate.test(t._1, t._2));
286-
}
287-
288274
@Override
289275
public M filterKeys(Predicate<? super K> predicate) {
290276
Objects.requireNonNull(predicate, "predicate is null");
@@ -297,13 +283,6 @@ public M filterNotKeys(Predicate<? super K> predicate) {
297283
return filterNot(t -> predicate.test(t._1));
298284
}
299285

300-
@Deprecated
301-
@Override
302-
public M rejectKeys(Predicate<? super K> predicate) {
303-
Objects.requireNonNull(predicate, "predicate is null");
304-
return reject(t -> predicate.test(t._1));
305-
}
306-
307286
@Override
308287
public M filterValues(Predicate<? super V> predicate) {
309288
Objects.requireNonNull(predicate, "predicate is null");
@@ -316,34 +295,6 @@ public M filterNotValues(Predicate<? super V> predicate) {
316295
return filterNot(t -> predicate.test(t._2));
317296
}
318297

319-
@Deprecated
320-
@Override
321-
public M rejectValues(Predicate<? super V> predicate) {
322-
Objects.requireNonNull(predicate, "predicate is null");
323-
return reject(t -> predicate.test(t._2));
324-
}
325-
326-
@Override
327-
@Deprecated
328-
public M removeAll(BiPredicate<? super K, ? super V> predicate) {
329-
Objects.requireNonNull(predicate, "predicate is null");
330-
return reject(predicate);
331-
}
332-
333-
@Override
334-
@Deprecated
335-
public M removeKeys(Predicate<? super K> predicate) {
336-
Objects.requireNonNull(predicate, "predicate is null");
337-
return rejectKeys(predicate);
338-
}
339-
340-
@Override
341-
@Deprecated
342-
public M removeValues(Predicate<? super V> predicate) {
343-
Objects.requireNonNull(predicate, "predicate is null");
344-
return rejectValues(predicate);
345-
}
346-
347298
@SuppressWarnings("unchecked")
348299
@Override
349300
public <C> Map<C, M> groupBy(Function<? super Tuple2<K, V>, ? extends C> classifier) {

‎src/main/java/io/vavr/collection/AbstractQueue.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -165,19 +165,6 @@ public Q removeAll(Iterable<? extends T> elements) {
165165
return Collections.removeAll((Q) this, elements);
166166
}
167167

168-
@Deprecated
169-
public Q removeAll(Predicate<? super T> predicate) {
170-
Objects.requireNonNull(predicate, "predicate is null");
171-
return reject(predicate);
172-
}
173-
174-
@SuppressWarnings("unchecked")
175-
@Deprecated
176-
@Override
177-
public Q reject(Predicate<? super T> predicate) {
178-
return Collections.reject((Q) this, predicate);
179-
}
180-
181168
@Override
182169
public Q takeWhile(Predicate<? super T> predicate) {
183170
Objects.requireNonNull(predicate, "predicate is null");

‎src/main/java/io/vavr/collection/Array.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -867,13 +867,6 @@ public Array<T> filterNot(Predicate<? super T> predicate) {
867867
return Collections.filterNot(this, predicate);
868868
}
869869

870-
@Deprecated
871-
@Override
872-
public Array<T> reject(Predicate<? super T> predicate) {
873-
Objects.requireNonNull(predicate, "predicate is null");
874-
return Collections.reject(this, predicate);
875-
}
876-
877870
@Override
878871
public <U> Array<U> flatMap(Function<? super T, ? extends Iterable<? extends U>> mapper) {
879872
Objects.requireNonNull(mapper, "mapper is null");
@@ -1178,13 +1171,6 @@ public Array<T> removeAll(Iterable<? extends T> elements) {
11781171
return io.vavr.collection.Collections.removeAll(this, elements);
11791172
}
11801173

1181-
@Override
1182-
@Deprecated
1183-
public Array<T> removeAll(Predicate<? super T> predicate) {
1184-
Objects.requireNonNull(predicate, "predicate is null");
1185-
return reject(predicate);
1186-
}
1187-
11881174
@Override
11891175
public Array<T> replace(T currentElement, T newElement) {
11901176
final Object[] arr = new Object[length()];

‎src/main/java/io/vavr/collection/BitSet.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,6 @@ public final BitSet<T> dropUntil(Predicate<? super T> predicate) {
391391
@Override
392392
public abstract BitSet<T> filterNot(Predicate<? super T> predicate);
393393

394-
@Deprecated
395-
@Override
396-
public abstract BitSet<T> reject(Predicate<? super T> predicate);
397-
398394
@Override
399395
public final <U> SortedSet<U> flatMap(Comparator<? super U> comparator, Function<? super T, ? extends Iterable<? extends U>> mapper) {
400396
Objects.requireNonNull(mapper, "mapper is null");
@@ -848,14 +844,6 @@ public BitSet<T> filterNot(Predicate<? super T> predicate) {
848844
return (bitSet.length() == length()) ? this : bitSet;
849845
}
850846

851-
@Deprecated
852-
@Override
853-
public BitSet<T> reject(Predicate<? super T> predicate) {
854-
Objects.requireNonNull(predicate, "predicate is null");
855-
final BitSet<T> bitSet = createFromAll(iterator().reject(predicate));
856-
return (bitSet.length() == length()) ? this : bitSet;
857-
}
858-
859847
@Override
860848
public <C> Map<C, BitSet<T>> groupBy(Function<? super T, ? extends C> classifier) {
861849
return Collections.groupBy(this, classifier, this::createFromAll);

‎src/main/java/io/vavr/collection/CharSeq.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -529,13 +529,6 @@ public CharSeq filterNot(Predicate<? super Character> predicate) {
529529
return Collections.filterNot(this, predicate);
530530
}
531531

532-
@Deprecated
533-
@Override
534-
public CharSeq reject(Predicate<? super Character> predicate) {
535-
Objects.requireNonNull(predicate, "predicate is null");
536-
return Collections.reject(this, predicate);
537-
}
538-
539532
@Override
540533
public <U> IndexedSeq<U> flatMap(Function<? super Character, ? extends Iterable<? extends U>> mapper) {
541534
Objects.requireNonNull(mapper, "mapper is null");
@@ -862,13 +855,6 @@ public CharSeq removeAll(Iterable<? extends Character> elements) {
862855
return io.vavr.collection.Collections.removeAll(this, elements);
863856
}
864857

865-
@Override
866-
@Deprecated
867-
public CharSeq removeAll(Predicate<? super Character> predicate) {
868-
Objects.requireNonNull(predicate, "predicate is null");
869-
return reject(predicate);
870-
}
871-
872858
@Override
873859
public CharSeq replace(Character currentElement, Character newElement) {
874860
if (currentElement == null) {

‎src/main/java/io/vavr/collection/Collections.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,6 @@ static <C extends Traversable<T>, T> C removeAll(C source, Iterable<? extends T>
318318
}
319319
}
320320

321-
@Deprecated
322-
@SuppressWarnings("unchecked")
323-
static <C extends Traversable<T>, T> C reject(C source, Predicate<? super T> predicate) {
324-
Objects.requireNonNull(predicate, "predicate is null");
325-
if (source.isEmpty()) {
326-
return source;
327-
} else {
328-
return (C) source.filter(predicate.negate());
329-
}
330-
}
331-
332321
@SuppressWarnings("unchecked")
333322
static <C extends Traversable<T>, T> C removeAll(C source, T element) {
334323
if (source.isEmpty()) {

‎src/main/java/io/vavr/collection/HashMap.java

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -552,12 +552,6 @@ public HashMap<K, V> filterNot(BiPredicate<? super K, ? super V> predicate) {
552552
return Maps.filterNot(this, this::createFromEntries, predicate);
553553
}
554554

555-
@Deprecated
556-
@Override
557-
public HashMap<K, V> reject(BiPredicate<? super K, ? super V> predicate) {
558-
return Maps.reject(this, this::createFromEntries, predicate);
559-
}
560-
561555
@Override
562556
public HashMap<K, V> filter(Predicate<? super Tuple2<K, V>> predicate) {
563557
return Maps.filter(this, this::createFromEntries, predicate);
@@ -568,12 +562,6 @@ public HashMap<K, V> filterNot(Predicate<? super Tuple2<K, V>> predicate) {
568562
return Maps.filterNot(this, this::createFromEntries, predicate);
569563
}
570564

571-
@Deprecated
572-
@Override
573-
public HashMap<K, V> reject(Predicate<? super Tuple2<K, V>> predicate) {
574-
return Maps.reject(this, this::createFromEntries, predicate);
575-
}
576-
577565
@Override
578566
public HashMap<K, V> filterKeys(Predicate<? super K> predicate) {
579567
return Maps.filterKeys(this, this::createFromEntries, predicate);
@@ -584,12 +572,6 @@ public HashMap<K, V> filterNotKeys(Predicate<? super K> predicate) {
584572
return Maps.filterNotKeys(this, this::createFromEntries, predicate);
585573
}
586574

587-
@Deprecated
588-
@Override
589-
public HashMap<K, V> rejectKeys(Predicate<? super K> predicate) {
590-
return Maps.rejectKeys(this, this::createFromEntries, predicate);
591-
}
592-
593575
@Override
594576
public HashMap<K, V> filterValues(Predicate<? super V> predicate) {
595577
return Maps.filterValues(this, this::createFromEntries, predicate);
@@ -600,12 +582,6 @@ public HashMap<K, V> filterNotValues(Predicate<? super V> predicate) {
600582
return Maps.filterNotValues(this, this::createFromEntries, predicate);
601583
}
602584

603-
@Deprecated
604-
@Override
605-
public HashMap<K, V> rejectValues(Predicate<? super V> predicate) {
606-
return Maps.rejectValues(this, this::createFromEntries, predicate);
607-
}
608-
609585
@Override
610586
public <K2, V2> HashMap<K2, V2> flatMap(BiFunction<? super K, ? super V, ? extends Iterable<Tuple2<K2, V2>>> mapper) {
611587
Objects.requireNonNull(mapper, "mapper is null");
@@ -786,13 +762,6 @@ public HashMap<K, V> remove(K key) {
786762
return result.size() == trie.size() ? this : wrap(result);
787763
}
788764

789-
@Override
790-
@Deprecated
791-
public HashMap<K, V> removeAll(BiPredicate<? super K, ? super V> predicate) {
792-
Objects.requireNonNull(predicate, "predicate is null");
793-
return reject(predicate);
794-
}
795-
796765
@Override
797766
public HashMap<K, V> removeAll(Iterable<? extends K> keys) {
798767
Objects.requireNonNull(keys, "keys is null");
@@ -810,20 +779,6 @@ public HashMap<K, V> removeAll(Iterable<? extends K> keys) {
810779
}
811780
}
812781

813-
@Override
814-
@Deprecated
815-
public HashMap<K, V> removeKeys(Predicate<? super K> predicate) {
816-
Objects.requireNonNull(predicate, "predicate is null");
817-
return rejectKeys(predicate);
818-
}
819-
820-
@Override
821-
@Deprecated
822-
public HashMap<K, V> removeValues(Predicate<? super V> predicate) {
823-
Objects.requireNonNull(predicate, "predicate is null");
824-
return rejectValues(predicate);
825-
}
826-
827782
@Override
828783
public HashMap<K, V> replace(Tuple2<K, V> currentElement, Tuple2<K, V> newElement) {
829784
return Maps.replace(this, currentElement, newElement);

‎src/main/java/io/vavr/collection/HashSet.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -576,13 +576,6 @@ public HashSet<T> filterNot(Predicate<? super T> predicate) {
576576
return filter(predicate.negate());
577577
}
578578

579-
@Deprecated
580-
@Override
581-
public HashSet<T> reject(Predicate<? super T> predicate) {
582-
Objects.requireNonNull(predicate, "predicate is null");
583-
return filter(predicate.negate());
584-
}
585-
586579
@Override
587580
public <U> HashSet<U> flatMap(Function<? super T, ? extends Iterable<? extends U>> mapper) {
588581
Objects.requireNonNull(mapper, "mapper is null");

‎src/main/java/io/vavr/collection/IndexedSeq.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ default boolean endsWith(Seq<? extends T> that) {
149149
@Override
150150
IndexedSeq<T> filterNot(Predicate<? super T> predicate);
151151

152-
@Deprecated
153-
@Override
154-
IndexedSeq<T> reject(Predicate<? super T> predicate);
155-
156152
@Override
157153
<U> IndexedSeq<U> flatMap(Function<? super T, ? extends Iterable<? extends U>> mapper);
158154

@@ -270,10 +266,6 @@ default int lastIndexWhere(Predicate<? super T> predicate, int end) {
270266
@Override
271267
IndexedSeq<T> removeAll(Iterable<? extends T> elements);
272268

273-
@Override
274-
@Deprecated
275-
IndexedSeq<T> removeAll(Predicate<? super T> predicate);
276-
277269
@Override
278270
IndexedSeq<T> replace(T currentElement, T newElement);
279271

‎src/main/java/io/vavr/collection/Iterator.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,13 +1504,6 @@ default Iterator<T> filterNot(Predicate<? super T> predicate) {
15041504
return filter(predicate.negate());
15051505
}
15061506

1507-
@Deprecated
1508-
@Override
1509-
default Iterator<T> reject(Predicate<? super T> predicate) {
1510-
Objects.requireNonNull(predicate, "predicate is null");
1511-
return filter(predicate.negate());
1512-
}
1513-
15141507
@Override
15151508
default Option<T> findLast(Predicate<? super T> predicate) {
15161509
Objects.requireNonNull(predicate, "predicate is null");

0 commit comments

Comments
 (0)