Removed deprecated monoid methods

mperry · mperry · commit ef68abe9ecdf · 2021-04-05T12:18:51.000+10:00
diff --git a/core/src/main/java/fj/Monoid.java b/core/src/main/java/fj/Monoid.java
@@ -466,20 +466,6 @@ public A append(A a1, A a2) {
     });
   }
 
-  /**
-   * Constructs a monoid from the given semigroup and zero value, which must follow the monoidal laws.
-   * @deprecated since 4.7. Use {@link #monoidDef(Semigroup.Definition, Object)} or {@link Semigroup#monoid(Object)} instead.
-   *
-   * @param s    The semigroup for the monoid.
-   * @param zero The zero for the monoid.
-   * @return A monoid instance that uses the given sun function and zero value.
-   */
-  @Deprecated
-  public static <A> Monoid<A> monoid(final Semigroup<A> s, final A zero) {
-    return s.monoid(zero);
-  }
-
-
   /**
    * A monoid that adds integers.
    */
@@ -528,19 +514,7 @@ public Integer multiply(int n, Integer integer) {
       return n <= 0 ? 1 : (int) StrictMath.pow(integer.doubleValue(), n);
     }
   });
-
-  /**
-   * @deprecated Since 4.7. Due to rounding errors, addition of doubles does not comply with monoid laws
-   */
-  @Deprecated
-  public static final Monoid<Double> doubleAdditionMonoid = monoidDef((d1, d2) -> d1 + d2, 0.0);
-
-  /**
-   * @deprecated Since 4.7. Due to rounding errors, multiplication of doubles does not comply with monoid laws
-   */
-  @Deprecated
-  public static final Monoid<Double> doubleMultiplicationMonoid = monoidDef((d1, d2) -> d1 * d2, 1.0);
-
+  
   /**
    * A monoid that adds big integers.
    */
@@ -889,17 +863,6 @@ public Option<A> sum(F0<Stream<Option<A>>> oas) {
     });
   }
 
-  /**
-   * A monoid for options.
-   * @deprecated since 4.7. Use {@link #firstOptionMonoid()}.
-   *
-   * @return A monoid for options.
-   */
-  @Deprecated
-  public static <A> Monoid<Option<A>> optionMonoid() {
-    return firstOptionMonoid();
-  }
-
   /**
    * A monoid for options that take the first available value.
    *
@@ -1121,16 +1084,4 @@ public Set<A> append(Set<A> a1, Set<A> a2) {
     });
   }
 
-  /**
-   * A monoid for the maximum of elements with ordering o.
-   * @deprecated since 4.7. Use {@link Ord#maxMonoid(Object)}
-   *
-   * @param o An ordering of elements.
-   * @param zero The minimum element.
-   */
-  @Deprecated
-  public static <A> Monoid<A> ordMaxMonoid(final Ord<A> o, final A zero) {
-    return o.maxMonoid(zero);
-  }
-
 }
