Corrected type signature in isA.

sf105 · sf105 · commit 90ebec477cd3 · 2016-04-07T14:57:50.000+02:00
hamcrest#27
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/Is.java b/hamcrest-core/src/main/java/org/hamcrest/core/Is.java
@@ -5,7 +5,6 @@
 import org.hamcrest.Matcher;
 
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
 
 /**
  * Decorates another Matcher, retaining the behaviour but allowing tests
@@ -46,7 +45,7 @@ public void describeMismatch(Object item, Description mismatchDescription) {
      * 
      */
     public static <T> Matcher<T> is(Matcher<T> matcher) {
-        return new Is<T>(matcher);
+        return new Is<>(matcher);
     }
 
     /**
@@ -69,8 +68,7 @@ public static <T> Matcher<T> is(T value) {
      * <pre>assertThat(cheese, is(instanceOf(Cheddar.class)))</pre>
      * 
      */
-    public static <T> Matcher<T> isA(Class<T> type) {
-        final Matcher<T> typeMatcher = instanceOf(type);
-        return is(typeMatcher);
+    public static <T> Matcher<T> isA(Class<?> type) {
+        return is(IsInstanceOf.<T>instanceOf(type));
     }
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/IsTest.java
@@ -43,7 +43,7 @@ public final class IsTest {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Test public void
     providesConvenientShortcutForIsInstanceOf() {
-        final Matcher matcher = isA(Integer.class);
+        final Matcher matcher = isA(Number.class);
         assertMatches(matcher, 1);
         assertDoesNotMatch(matcher, new Object());
         assertDoesNotMatch(matcher, null);
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
@@ -215,7 +215,7 @@ public static <T> org.hamcrest.Matcher<T> is(T value) {
    * instead of:
    * <pre>assertThat(cheese, is(instanceOf(Cheddar.class)))</pre>
    */
-  public static <T> org.hamcrest.Matcher<T> isA(java.lang.Class<T> type) {
+  public static <T> org.hamcrest.Matcher<T> isA(java.lang.Class<?> type) {
     return org.hamcrest.core.Is.isA(type);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`import org.hamcrest.Matcher;`
`6`	`6`
`7`	`7`	`import static org.hamcrest.core.IsEqual.equalTo;`
`8`		`-import static org.hamcrest.core.IsInstanceOf.instanceOf;`
`9`	`8`
`10`	`9`	`/**`
`11`	`10`	`* Decorates another Matcher, retaining the behaviour but allowing tests`
`@@ -46,7 +45,7 @@ public void describeMismatch(Object item, Description mismatchDescription) {`
`46`	`45`	`*`
`47`	`46`	`*/`
`48`	`47`	`public static <T> Matcher<T> is(Matcher<T> matcher) {`
`49`		`- return new Is<T>(matcher);`
	`48`	`+ return new Is<>(matcher);`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`/**`
`@@ -69,8 +68,7 @@ public static <T> Matcher<T> is(T value) {`
`69`	`68`	`* <pre>assertThat(cheese, is(instanceOf(Cheddar.class)))</pre>`
`70`	`69`	`*`
`71`	`70`	`*/`
`72`		`- public static <T> Matcher<T> isA(Class<T> type) {`
`73`		`- final Matcher<T> typeMatcher = instanceOf(type);`
`74`		`- return is(typeMatcher);`
	`71`	`+ public static <T> Matcher<T> isA(Class<?> type) {`
	`72`	`+ return is(IsInstanceOf.<T>instanceOf(type));`
`75`	`73`	`}`
`76`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public static <T> org.hamcrest.Matcher<T> is(T value) {`
`215`	`215`	`* instead of:`
`216`	`216`	`* <pre>assertThat(cheese, is(instanceOf(Cheddar.class)))</pre>`
`217`	`217`	`*/`
`218`		`- public static <T> org.hamcrest.Matcher<T> isA(java.lang.Class<T> type) {`
	`218`	`+ public static <T> org.hamcrest.Matcher<T> isA(java.lang.Class<?> type) {`
`219`	`219`	`return org.hamcrest.core.Is.isA(type);`
`220`	`220`	`}`
`221`	`221`