Skip to content

Commit cdd8fbe

Browse files
committed
Avoid unecessary array type cast.
1 parent 1e40671 commit cdd8fbe

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

quickcheck/src/main/java/fj/test/Arbitrary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ public static <A> Arbitrary<Array<A>> arbArray(final Arbitrary<A> aa) {
716716
*/
717717
@SuppressWarnings("unchecked")
718718
public static <A> Arbitrary<Seq<A>> arbSeq(final Arbitrary<A> aa) {
719-
return arbitrary(arbArray(aa).gen.map(array -> Seq.seq((A[]) array.array())));
719+
return arbitrary(arbArray(aa).gen.map(Seq::iterableSeq));
720720
}
721721

722722
public static <A> Arbitrary<Set<A>> arbSet(Ord<A> ord, final Arbitrary<A> aa) {

quickcheck/src/main/java/fj/test/Coarbitrary.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import fj.data.*;
99

1010
import static fj.data.Array.array;
11+
import static fj.data.Array.iterableArray;
1112
import static fj.data.List.fromString;
1213
import static fj.data.List.nil;
1314

@@ -525,7 +526,7 @@ public static <A> Coarbitrary<ArrayList<A>> coarbArrayList(final Coarbitrary<A>
525526
return new Coarbitrary<ArrayList<A>>() {
526527
@SuppressWarnings("unchecked")
527528
public <B> Gen<B> coarbitrary(final ArrayList<A> as, final Gen<B> g) {
528-
return coarbArray(ca).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
529+
return coarbArray(ca).coarbitrary(iterableArray(as), g);
529530
}
530531
};
531532
}
@@ -630,7 +631,7 @@ public static <A> Coarbitrary<HashSet<A>> coarbHashSet(final Coarbitrary<A> c) {
630631
return new Coarbitrary<HashSet<A>>() {
631632
@SuppressWarnings("unchecked")
632633
public <B> Gen<B> coarbitrary(final HashSet<A> as, final Gen<B> g) {
633-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
634+
return coarbArray(c).coarbitrary(iterableArray(as), g);
634635
}
635636
};
636637
}
@@ -716,7 +717,7 @@ public static <A> Coarbitrary<LinkedList<A>> coarbLinkedList(final Coarbitrary<A
716717
return new Coarbitrary<LinkedList<A>>() {
717718
@SuppressWarnings("unchecked")
718719
public <B> Gen<B> coarbitrary(final LinkedList<A> as, final Gen<B> g) {
719-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
720+
return coarbArray(c).coarbitrary(iterableArray(as), g);
720721
}
721722
};
722723
}
@@ -731,7 +732,7 @@ public static <A> Coarbitrary<PriorityQueue<A>> coarbPriorityQueue(final Coarbit
731732
return new Coarbitrary<PriorityQueue<A>>() {
732733
@SuppressWarnings("unchecked")
733734
public <B> Gen<B> coarbitrary(final PriorityQueue<A> as, final Gen<B> g) {
734-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
735+
return coarbArray(c).coarbitrary(iterableArray(as), g);
735736
}
736737
};
737738
}
@@ -762,7 +763,7 @@ public static <A> Coarbitrary<Stack<A>> coarbStack(final Coarbitrary<A> c) {
762763
return new Coarbitrary<Stack<A>>() {
763764
@SuppressWarnings("unchecked")
764765
public <B> Gen<B> coarbitrary(final Stack<A> as, final Gen<B> g) {
765-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
766+
return coarbArray(c).coarbitrary(iterableArray(as), g);
766767
}
767768
};
768769
}
@@ -808,7 +809,7 @@ public static <A> Coarbitrary<Vector<A>> coarbVector(final Coarbitrary<A> c) {
808809
return new Coarbitrary<Vector<A>>() {
809810
@SuppressWarnings({"unchecked", "UseOfObsoleteCollectionType"})
810811
public <B> Gen<B> coarbitrary(final Vector<A> as, final Gen<B> g) {
811-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
812+
return coarbArray(c).coarbitrary(iterableArray(as), g);
812813
}
813814
};
814815
}
@@ -844,7 +845,7 @@ public static <A> Coarbitrary<ArrayBlockingQueue<A>> coarbArrayBlockingQueue(fin
844845
return new Coarbitrary<ArrayBlockingQueue<A>>() {
845846
@SuppressWarnings("unchecked")
846847
public <B> Gen<B> coarbitrary(final ArrayBlockingQueue<A> as, final Gen<B> g) {
847-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
848+
return coarbArray(c).coarbitrary(iterableArray(as), g);
848849
}
849850
};
850851
}
@@ -876,7 +877,7 @@ public static <A> Coarbitrary<ConcurrentLinkedQueue<A>> coarbConcurrentLinkedQue
876877
return new Coarbitrary<ConcurrentLinkedQueue<A>>() {
877878
@SuppressWarnings("unchecked")
878879
public <B> Gen<B> coarbitrary(final ConcurrentLinkedQueue<A> as, final Gen<B> g) {
879-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
880+
return coarbArray(c).coarbitrary(iterableArray(as), g);
880881
}
881882
};
882883
}
@@ -891,7 +892,7 @@ public static <A> Coarbitrary<CopyOnWriteArrayList<A>> coarbCopyOnWriteArrayList
891892
return new Coarbitrary<CopyOnWriteArrayList<A>>() {
892893
@SuppressWarnings("unchecked")
893894
public <B> Gen<B> coarbitrary(final CopyOnWriteArrayList<A> as, final Gen<B> g) {
894-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
895+
return coarbArray(c).coarbitrary(iterableArray(as), g);
895896
}
896897
};
897898
}
@@ -906,7 +907,7 @@ public static <A> Coarbitrary<CopyOnWriteArraySet<A>> coarbCopyOnWriteArraySet(f
906907
return new Coarbitrary<CopyOnWriteArraySet<A>>() {
907908
@SuppressWarnings("unchecked")
908909
public <B> Gen<B> coarbitrary(final CopyOnWriteArraySet<A> as, final Gen<B> g) {
909-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
910+
return coarbArray(c).coarbitrary(iterableArray(as), g);
910911
}
911912
};
912913
}
@@ -921,7 +922,7 @@ public static <A extends Delayed> Coarbitrary<DelayQueue<A>> coarbDelayQueue(fin
921922
return new Coarbitrary<DelayQueue<A>>() {
922923
@SuppressWarnings("unchecked")
923924
public <B> Gen<B> coarbitrary(final DelayQueue<A> as, final Gen<B> g) {
924-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
925+
return coarbArray(c).coarbitrary(iterableArray(as), g);
925926
}
926927
};
927928
}
@@ -936,7 +937,7 @@ public static <A> Coarbitrary<LinkedBlockingQueue<A>> coarbLinkedBlockingQueue(f
936937
return new Coarbitrary<LinkedBlockingQueue<A>>() {
937938
@SuppressWarnings("unchecked")
938939
public <B> Gen<B> coarbitrary(final LinkedBlockingQueue<A> as, final Gen<B> g) {
939-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
940+
return coarbArray(c).coarbitrary(iterableArray(as), g);
940941
}
941942
};
942943
}
@@ -951,7 +952,7 @@ public static <A> Coarbitrary<PriorityBlockingQueue<A>> coarbPriorityBlockingQue
951952
return new Coarbitrary<PriorityBlockingQueue<A>>() {
952953
@SuppressWarnings("unchecked")
953954
public <B> Gen<B> coarbitrary(final PriorityBlockingQueue<A> as, final Gen<B> g) {
954-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
955+
return coarbArray(c).coarbitrary(iterableArray(as), g);
955956
}
956957
};
957958
}
@@ -966,7 +967,7 @@ public static <A> Coarbitrary<SynchronousQueue<A>> coarbSynchronousQueue(final C
966967
return new Coarbitrary<SynchronousQueue<A>>() {
967968
@SuppressWarnings("unchecked")
968969
public <B> Gen<B> coarbitrary(final SynchronousQueue<A> as, final Gen<B> g) {
969-
return coarbArray(c).coarbitrary(array(as.toArray((A[]) new Object[as.size()])), g);
970+
return coarbArray(c).coarbitrary(iterableArray(as), g);
970971
}
971972
};
972973
}

0 commit comments

Comments
 (0)