diff options
author | Paul Duffin <paulduffin@google.com> | 2017-02-08 11:52:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-08 11:52:37 +0000 |
commit | e6442f26044745627cb13452271ab5cfb171bdf4 (patch) | |
tree | 20450ddaeccffed3d7254a742f253632088ea102 | |
parent | 11a97a2ff7513f61b3989a068aa64a452a94c975 (diff) | |
parent | f019c17e6833068464689143be1036ce622e3bbe (diff) | |
download | hamcrest-e6442f26044745627cb13452271ab5cfb171bdf4.tar.gz |
Merge "Temporarily add void is(Class) to cause compile time errors" am: 21a7b5b68f
am: f019c17e68
Change-Id: Id38f78144dc2ae1d0192942de2ae2ff4b6869ae8
-rw-r--r-- | hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java | 20 | ||||
-rw-r--r-- | hamcrest-library/src/main/java/org/hamcrest/Matchers.java | 24 |
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. |