Merge "Temporarily add void is(Class) to cause compile time errors" am: 21a7b5b68f am: f019c17e68

am: e6442f2604

Change-Id: Ice7c16b51eda7dfd8dfed60f1476cdf13286668c

2 files changed, 28 insertions, 16 deletions

diff --git a/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java b/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java
index dd36acb..400a491 100644
--- a/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java
@@ -25,13 +25,19 @@ public class CoreMatchers {
   }
 
   /**
-   * This is a shortcut to the frequently used is(instanceOf(SomeClass.class)).
-   * 
-   * eg. assertThat(cheese, is(instanceOf(Cheddar.class)))
-   * vs assertThat(cheese, is(Cheddar.class))
-   */
-  public static org.hamcrest.Matcher<java.lang.Object> is(java.lang.Class<?> type) {
-    return org.hamcrest.core.Is.is(type);
+   * Provided to cause compile time error when used in preference to a possible runtime error if
+   * this was not here.
+   *
+   * <p>This method was removed upstream between Hamcrest 1.1 and 1.3 in favour of the
+   * instanceOf(Class) method. Unfortunately, existing usages of it could still compile against the
+   * {@link #is(Object)} method instead. Although not every existing usage would compile
+   * successfully it is possible that some could and that would result in a change in the runtime
+   * behavior that could be difficult to detect and fix. This change aims to turn any significant
+   * usage of this method into a compile time error.
+   *
+   * @deprecated Use instanceOf(SomeClass.class) instead.
+   */
+  public static void is(java.lang.Class<?> type) {
   }
 
   /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
index ce550b5..2e82aa0 100644
--- a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
@@ -24,15 +24,21 @@ public class Matchers {
         return org.hamcrest.core.Is.is(value);
     }
 
-    /**
-     * This is a shortcut to the frequently used is(instanceOf(SomeClass.class)).
-     * 
-     * eg. assertThat(cheese, is(instanceOf(Cheddar.class)))
-     * vs assertThat(cheese, is(Cheddar.class))
-     */
-    public static org.hamcrest.Matcher<java.lang.Object> is(java.lang.Class<?> type) {
-        return org.hamcrest.core.Is.is(type);
-    }
+  /**
+   * Provided to cause compile time error when used in preference to a possible runtime error if
+   * this was not here.
+   *
+   * <p>This method was removed upstream between Hamcrest 1.1 and 1.3 in favour of the
+   * instanceOf(Class) method. Unfortunately, existing usages of it could still compile against the
+   * {@link #is(Object)} method instead. Although not every existing usage would compile
+   * successfully it is possible that some could and that would result in a change in the runtime
+   * behavior that could be difficult to detect and fix. This change aims to turn any significant
+   * usage of this method into a compile time error.
+   *
+   * @deprecated Use instanceOf(SomeClass.class) instead.
+   */
+  public static void is(java.lang.Class<?> type) {
+  }
 
     /**
      * Inverts the rule.