Removed deprecated methods from quickcheck

mperry · mperry · commit e6234b801de4 · 2021-04-05T15:54:41.000+10:00
diff --git a/quickcheck/src/main/java/fj/test/Gen.java b/quickcheck/src/main/java/fj/test/Gen.java
@@ -536,24 +536,6 @@ public static <A> Gen<A> pickOne(List<A> as) {
     return wordOf(1, as).map(List::head);
   }
 
-  /**
-   * Returns a generator of lists that picks the given number of elements from the given list. If
-   * the given number is less than zero or greater than the length of the given list, then the
-   * returned generator will never produce a value.
-   * <p>
-   * Note: pick is synonymous with combinationOf
-   *
-   * @deprecated As of release 4.6, use {@link #combinationOf}
-   *
-   * @param n  The number of elements to pick from the given list.
-   * @param as The list from which to pick elements.
-   * @return A generator of lists that picks the given number of elements from the given list.
-   */
-  @Deprecated
-  public static <A> Gen<List<A>> pick(int n, List<A> as) {
-    return combinationOf(n, as);
-  }
-
   /**
    * Returns a generator of lists that picks the given number of elements from the given list. The selection is
    * a combination without replacement of elements from the given list, i.e.
@@ -678,21 +660,6 @@ private static <A> Gen<List<A>> pick(Gen<List<Integer>> indexesGen, Array<A> as)
         indexes.foldLeft((acc, index) -> cons(as.get(index), acc), List.<A>nil()).reverse());
   }
 
-  /**
-   * Returns a generator of lists that produces some of the values of the given list.
-   * <p>
-   * Note: someOf is synonymous with someCombinationOf
-   *
-   * @deprecated As of release 4.6, use {@link #someCombinationOf}
-   *
-   * @param as The list from which to pick values.
-   * @return A generator of lists that produces some of the values of the given list.
-   */
-  @Deprecated
-  public static <A> Gen<List<A>> someOf(List<A> as) {
-    return someCombinationOf(as);
-  }
-
   /**
    * Returns a generator of lists that produces some of the values of the given list. The selection is
    * a combination without replacement of elements from the given list, i.e.
diff --git a/quickcheck/src/main/java/fj/test/Rand.java b/quickcheck/src/main/java/fj/test/Rand.java
@@ -5,7 +5,6 @@
 
 import java.util.Random;
 
-import static fj.data.Option.none;
 import static fj.data.Option.some;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
@@ -18,18 +17,16 @@
 public final class Rand {
   private final F<Option<Long>, F<Integer, F<Integer, Integer>>> f;
   private final F<Option<Long>, F<Double, F<Double, Double>>> g;
-
-  // TODO Change to F<Long,Rand> when rand(f,g) is removed
-  private final Option<F<Long, Rand>> optOnReseed;
+  private final F<Long, Rand> onReseed;
 
   private Rand(
       F<Option<Long>, F<Integer, F<Integer, Integer>>> f,
       F<Option<Long>, F<Double, F<Double, Double>>> g,
-      Option<F<Long, Rand>> optOnReseed) {
+      F<Long, Rand> onReseed) {
 
     this.f = f;
     this.g = g;
-    this.optOnReseed = optOnReseed;
+    this.onReseed = onReseed;
   }
 
   /**
@@ -88,33 +85,7 @@ public double choose(final double from, final double to) {
    * @return A random generator with the given seed.
    */
   public Rand reseed(long seed) {
-    return optOnReseed.<Rand>option(
-        () -> {
-          throw new IllegalStateException("reseed() called on a Rand created with deprecated rand() method");
-        },
-        onReseed -> onReseed.f(seed));
-  }
-
-  /**
-   * Constructs a random generator from the given functions that supply a range to produce a
-   * result.
-   * <p>
-   * Calling {@link #reseed(long)} on an instance returned from this method will
-   * result in an exception being thrown.
-   *
-   * @deprecated As of release 4.6, use {@link #rand(F, F, F)}.
-   *
-   * @param f The integer random generator.
-   * @param g The floating-point random generator.
-   * @return A random generator from the given functions that supply a range to produce a result.
-   */
-  // TODO Change Option<F<Long,Rand>> optOnReseed to F<Long,Road> onReseed when removing this method
-  @Deprecated
-  public static Rand rand(
-      F<Option<Long>, F<Integer, F<Integer, Integer>>> f,
-      F<Option<Long>, F<Double, F<Double, Double>>> g) {
-
-    return new Rand(f, g, none());
+    return onReseed.f(seed);
   }
 
   /**
@@ -131,7 +102,7 @@ public static Rand rand(
       F<Option<Long>, F<Double, F<Double, Double>>> g,
       F<Long, Rand> onReseed) {
 
-    return new Rand(f, g, some(onReseed));
+    return new Rand(f, g, onReseed);
   }
 
   /**
