From 16d1e0df788186b886931511797596409ef87bb8 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <TimvdLippe@users.noreply.github.com>
Date: Mon, 18 Nov 2019 17:11:11 +0000
Subject: [PATCH] Deprecate MockitoHamcrest (#1819)

This class was used during the migration period from Mockito 1 and
Mockito 2, but is no longer necessary. To be able to remove our
dependency on Hamcrest, we should remove MockitoHamcrest.
---
 .../org/mockito/hamcrest/MockitoHamcrest.java | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java b/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java
index d4b4304033..ead10e2a02 100644
--- a/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java
+++ b/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java
@@ -44,7 +44,10 @@
  * If you have an idea how to fix the problem, let us know via the mailing list or the issue tracker.
  *
  * @since 2.1.0
+ *
+ * @deprecated Use the regular {@link org.mockito.ArgumentMatchers#argThat(ArgumentMatcher)} instead
  */
+@Deprecated
 public class MockitoHamcrest {
 
     /**
@@ -55,7 +58,9 @@ public class MockitoHamcrest {
      * @param matcher decides whether argument matches
      * @return <code>null</code> or default value for primitive (0, false, etc.)
      * @since 2.1.0
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#argThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     @SuppressWarnings("unchecked")
     public static <T> T argThat(Matcher<T> matcher) {
         reportMatcher(matcher);
@@ -70,7 +75,9 @@ public static <T> T argThat(Matcher<T> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>0</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#charThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static char charThat(Matcher<Character> matcher) {
         reportMatcher(matcher);
         return 0;
@@ -84,7 +91,9 @@ public static char charThat(Matcher<Character> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>false</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#booleanThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static boolean booleanThat(Matcher<Boolean> matcher) {
         reportMatcher(matcher);
         return false;
@@ -98,7 +107,9 @@ public static boolean booleanThat(Matcher<Boolean> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>0</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#byteThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static byte byteThat(Matcher<Byte> matcher) {
         reportMatcher(matcher);
         return 0;
@@ -112,7 +123,9 @@ public static byte byteThat(Matcher<Byte> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>0</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#shortThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static short shortThat(Matcher<Short> matcher) {
         reportMatcher(matcher);
         return 0;
@@ -126,7 +139,9 @@ public static short shortThat(Matcher<Short> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>0</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#intThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static int intThat(Matcher<Integer> matcher) {
         reportMatcher(matcher);
         return 0;
@@ -140,7 +155,9 @@ public static int intThat(Matcher<Integer> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>0</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#longThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static long longThat(Matcher<Long> matcher) {
         reportMatcher(matcher);
         return 0;
@@ -154,7 +171,9 @@ public static long longThat(Matcher<Long> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>0</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#floatThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static float floatThat(Matcher<Float> matcher) {
         reportMatcher(matcher);
         return 0;
@@ -168,7 +187,9 @@ public static float floatThat(Matcher<Float> matcher) {
      *
      * @param matcher decides whether argument matches
      * @return <code>0</code>.
+     * @deprecated Use {@link org.mockito.ArgumentMatchers#doubleThat(ArgumentMatcher)} instead
      */
+    @Deprecated
     public static double doubleThat(Matcher<Double> matcher) {
         reportMatcher(matcher);
         return 0;