From ad2f3526a347f37dd00c53ee664c5cd9f3738814 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@google.com>
Date: Wed, 20 Nov 2019 12:36:25 +0000
Subject: [PATCH] Revert "Deprecate MockitoHamcrest (#1819)"

This reverts commit d4544a82695324d8efb6c949e8db0a62fbd62636.
---
 .../org/mockito/hamcrest/MockitoHamcrest.java | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java b/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java
index ead10e2a02..d4b4304033 100644
--- a/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java
+++ b/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java
@@ -44,10 +44,7 @@
  * 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 {
 
     /**
@@ -58,9 +55,7 @@ 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);
@@ -75,9 +70,7 @@ 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;
@@ -91,9 +84,7 @@ 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;
@@ -107,9 +98,7 @@ 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;
@@ -123,9 +112,7 @@ 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;
@@ -139,9 +126,7 @@ 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;
@@ -155,9 +140,7 @@ 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;
@@ -171,9 +154,7 @@ 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;
@@ -187,9 +168,7 @@ 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;