Skip to content

Commit 4bebbc9

Browse files
GlavoGlavo
committed
Delete unused views
1 parent d171dcc commit 4bebbc9

File tree

6 files changed

+28
-105
lines changed

6 files changed

+28
-105
lines changed

‎kala-collection/src/main/java/kala/collection/CollectionLike.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import kala.annotations.DelegateBy;
1919
import kala.collection.base.Traversable;
2020
import kala.collection.immutable.*;
21+
import kala.collection.internal.view.CollectionViews;
2122
import kala.collection.mutable.MutableSeq;
2223
import kala.function.CheckedConsumer;
2324
import kala.tuple.Tuple;
@@ -41,7 +42,9 @@ public interface CollectionLike<E> extends Traversable<E>, AnyCollectionLike<E>
4142
@Override
4243
@NotNull CollectionView<E> view();
4344

44-
@NotNull CollectionLike<E> filter(@NotNull Predicate<? super E> predicate);
45+
default @NotNull CollectionLike<E> filter(@NotNull Predicate<? super E> predicate) {
46+
return new CollectionViews.Filter<>(this, predicate);
47+
}
4548

4649
@NotNull CollectionLike<E> filterNot(@NotNull Predicate<? super E> predicate);
4750

‎kala-collection/src/main/java/kala/collection/CollectionView.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,27 @@ public interface CollectionView<@Covariant E> extends CollectionLike<E>, AnyColl
5454
return this;
5555
}
5656

57+
@Override
5758
default @NotNull CollectionView<E> filter(@NotNull Predicate<? super E> predicate) {
5859
Objects.requireNonNull(predicate);
5960
return new CollectionViews.Filter<>(this, predicate);
6061
}
6162

63+
@Override
64+
@DelegateBy("filter(Predicate<E>)")
6265
default @NotNull CollectionView<E> filterNot(@NotNull Predicate<? super E> predicate) {
63-
Objects.requireNonNull(predicate);
64-
return new CollectionViews.FilterNot<>(this, predicate);
66+
return filter(predicate.negate());
6567
}
6668

69+
@Override
70+
@DelegateBy("filter(Predicate<E>)")
6771
default @NotNull CollectionView<@NotNull E> filterNotNull() {
68-
return new CollectionViews.FilterNotNull<>(this);
72+
return filter(Predicates.isNotNull());
6973
}
7074

7175
@Override
7276
default <U> @NotNull CollectionView<@NotNull U> filterIsInstance(@NotNull Class<? extends U> clazz) {
73-
return ((CollectionView<U>) filter(Predicates.isInstance(clazz)));
77+
return (CollectionView<U>) filter(Predicates.isInstance(clazz));
7478
}
7579

7680
default <U> @NotNull CollectionView<U> map(@NotNull Function<? super E, ? extends U> mapper) {

‎kala-collection/src/main/java/kala/collection/SeqView.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,19 @@ static <E> SeqView<E> narrow(SeqView<? extends E> view) {
243243
}
244244

245245
@Override
246+
@DelegateBy("filter(Predicate<E>)")
246247
default @NotNull SeqView<E> filterNot(@NotNull Predicate<? super E> predicate) {
247-
Objects.requireNonNull(predicate);
248-
return new SeqViews.FilterNot<>(this, predicate);
248+
return filter(predicate.negate());
249249
}
250250

251251
@Override
252+
@DelegateBy("filter(Predicate<E>)")
252253
default @NotNull SeqView<@NotNull E> filterNotNull() {
253-
return new SeqViews.FilterNotNull<>(this);
254+
return filter(Predicates.isNotNull());
254255
}
255256

256257
@Override
258+
@DelegateBy("filter(Predicate<E>)")
257259
default <U> @NotNull SeqView<@NotNull U> filterIsInstance(@NotNull Class<? extends U> clazz) {
258260
return (SeqView<U>) filter(Predicates.isInstance(clazz));
259261
}

‎kala-collection/src/main/java/kala/collection/SetView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,19 @@ public interface SetView<@Covariant E> extends CollectionView<E>, SetLike<E>, An
9191
}
9292

9393
@Override
94+
@DelegateBy("filter(Predicate<E>)")
9495
default @NotNull SetView<E> filterNot(@NotNull Predicate<? super E> predicate) {
9596
return filter(predicate.negate());
9697
}
9798

9899
@Override
100+
@DelegateBy("filter(Predicate<E>)")
99101
default @NotNull SetView<@NotNull E> filterNotNull() {
100102
return filter(Predicates.isNotNull());
101103
}
102104

103105
@Override
106+
@DelegateBy("filter(Predicate<E>)")
104107
default <U> @NotNull SetView<@NotNull U> filterIsInstance(@NotNull Class<? extends U> clazz) {
105108
@SuppressWarnings("unchecked")
106109
SetView<U> result = (SetView<U>) filter(Predicates.isInstance(clazz));

‎kala-collection/src/main/java/kala/collection/internal/view/CollectionViews.java

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -567,10 +567,10 @@ public MapMulti(@NotNull CollectionView<T> source, @NotNull BiConsumer<? super T
567567
}
568568

569569
public static final class Filter<@Covariant E> extends AbstractCollectionView<E> {
570-
private final @NotNull CollectionView<E> source;
570+
private final @NotNull CollectionLike<E> source;
571571
private final @NotNull Predicate<? super E> predicate;
572572

573-
public Filter(@NotNull CollectionView<E> source, @NotNull Predicate<? super E> predicate) {
573+
public Filter(@NotNull CollectionLike<E> source, @NotNull Predicate<? super E> predicate) {
574574
this.source = source;
575575
this.predicate = predicate;
576576
}
@@ -591,51 +591,12 @@ public Filter(@NotNull CollectionView<E> source, @NotNull Predicate<? super E> p
591591
}
592592
}
593593

594-
public static final class FilterNot<@Covariant E> extends AbstractCollectionView<E> {
595-
private final @NotNull CollectionView<E> source;
596-
597-
private final @NotNull Predicate<? super E> predicate;
598-
599-
public FilterNot(@NotNull CollectionView<E> source, @NotNull Predicate<? super E> predicate) {
600-
this.source = source;
601-
this.predicate = predicate;
602-
}
603-
604-
@Override
605-
public @NotNull Iterator<E> iterator() {
606-
return Iterators.filterNot(source.iterator(), predicate);
607-
}
608-
609-
@Override
610-
public @NotNull Stream<E> stream() {
611-
return source.stream().filter(predicate.negate());
612-
}
613-
614-
@Override
615-
public @NotNull Stream<E> parallelStream() {
616-
return source.stream().filter(predicate.negate()).parallel();
617-
}
618-
}
619-
620-
public static final class FilterNotNull<@Covariant E> extends AbstractCollectionView<E> {
621-
private final @NotNull CollectionView<E> source;
622-
623-
public FilterNotNull(@NotNull CollectionView<E> source) {
624-
this.source = source;
625-
}
626-
627-
@Override
628-
public @NotNull Iterator<E> iterator() {
629-
return Iterators.filterNotNull(source.iterator());
630-
}
631-
}
632-
633594
public static final class FlatMapped<@Covariant E, T> extends AbstractCollectionView<E> {
634-
private final @NotNull CollectionView<? extends T> source;
595+
private final @NotNull CollectionLike<? extends T> source;
635596
private final @NotNull Function<? super T, ? extends Iterable<? extends E>> mapper;
636597

637598
public FlatMapped(
638-
@NotNull CollectionView<? extends T> source,
599+
@NotNull CollectionLike<? extends T> source,
639600
@NotNull Function<? super T, ? extends Iterable<? extends E>> mapper) {
640601
this.source = source;
641602
this.mapper = mapper;
@@ -648,11 +609,11 @@ public FlatMapped(
648609
}
649610

650611
public static final class Zip<E, U, R> extends AbstractCollectionView<R> {
651-
private final @NotNull CollectionView<? extends E> source;
612+
private final @NotNull CollectionLike<? extends E> source;
652613
private final @NotNull Iterable<? extends U> other;
653614
private final @NotNull BiFunction<? super E, ? super U, ? extends R> mapper;
654615

655-
public Zip(@NotNull CollectionView<? extends E> source, @NotNull Iterable<? extends U> other, @NotNull BiFunction<? super E, ? super U, ? extends R> mapper) {
616+
public Zip(@NotNull CollectionLike<? extends E> source, @NotNull Iterable<? extends U> other, @NotNull BiFunction<? super E, ? super U, ? extends R> mapper) {
656617
this.source = source;
657618
this.other = other;
658619
this.mapper = mapper;
@@ -665,11 +626,11 @@ public Zip(@NotNull CollectionView<? extends E> source, @NotNull Iterable<? exte
665626
}
666627

667628
public static final class Zip3<E, U, V> extends AbstractCollectionView<Tuple3<E, U, V>> {
668-
private final @NotNull CollectionView<? extends E> source;
629+
private final @NotNull CollectionLike<? extends E> source;
669630
private final @NotNull Iterable<? extends U> other1;
670631
private final @NotNull Iterable<? extends V> other2;
671632

672-
public Zip3(@NotNull CollectionView<? extends E> source, @NotNull Iterable<? extends U> other1, @NotNull Iterable<? extends V> other2) {
633+
public Zip3(@NotNull CollectionLike<? extends E> source, @NotNull Iterable<? extends U> other1, @NotNull Iterable<? extends V> other2) {
673634
this.source = source;
674635
this.other1 = other1;
675636
this.other2 = other2;

‎kala-collection/src/main/java/kala/collection/internal/view/SeqViews.java

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import kala.function.IndexedBiConsumer;
2525
import kala.function.IndexedConsumer;
2626
import kala.function.IndexedFunction;
27-
import kala.function.Predicates;
2827
import kala.index.Index;
2928
import kala.index.Indexes;
3029
import kala.tuple.Tuple;
@@ -1105,55 +1104,6 @@ public Filter(@NotNull SeqView<E> source, @NotNull Predicate<? super E> predicat
11051104
}
11061105
}
11071106

1108-
public static final class FilterNot<E> extends AbstractSeqView<E> {
1109-
private final @NotNull SeqView<E> source;
1110-
1111-
private final @NotNull Predicate<? super E> predicate;
1112-
1113-
public FilterNot(@NotNull SeqView<E> source, @NotNull Predicate<? super E> predicate) {
1114-
this.source = source;
1115-
this.predicate = predicate;
1116-
}
1117-
1118-
@Override
1119-
public final @NotNull Iterator<E> iterator() {
1120-
return Iterators.filterNot(source.iterator(), predicate);
1121-
}
1122-
1123-
@Override
1124-
public @NotNull Stream<E> stream() {
1125-
return source.stream().filter(predicate.negate());
1126-
}
1127-
1128-
@Override
1129-
public @NotNull Stream<E> parallelStream() {
1130-
return source.parallelStream().filter(predicate.negate());
1131-
}
1132-
}
1133-
1134-
public static final class FilterNotNull<E> extends AbstractSeqView<E> {
1135-
private final @NotNull SeqView<E> source;
1136-
1137-
public FilterNotNull(@NotNull SeqView<E> source) {
1138-
this.source = source;
1139-
}
1140-
1141-
@Override
1142-
public final @NotNull Iterator<E> iterator() {
1143-
return Iterators.filterNotNull(source.iterator());
1144-
}
1145-
1146-
@Override
1147-
public @NotNull Stream<E> stream() {
1148-
return source.stream().filter(Predicates.isNotNull());
1149-
}
1150-
1151-
@Override
1152-
public @NotNull Stream<E> parallelStream() {
1153-
return source.parallelStream().filter(Predicates.isNotNull());
1154-
}
1155-
}
1156-
11571107
public static final class FlatMapped<E, T> extends AbstractSeqView<E> {
11581108
private final @NotNull SeqView<? extends T> source;
11591109

0 commit comments

Comments
 (0)