remove scope warnings

sf105 · sf105 · commit ad9635966cb2 · 2016-05-19T13:40:59.000+01:00
diff --git a/hamcrest-core/src/main/java/org/hamcrest/internal/ReflectiveTypeFinder.java b/hamcrest-core/src/main/java/org/hamcrest/internal/ReflectiveTypeFinder.java
@@ -53,7 +53,7 @@ public Class<?> findExpectedType(Class<?> fromClass) {
    * @param method The method to examine.
    * @return true if this method references the relevant type
    */
-  protected boolean canObtainExpectedTypeFrom(Method method) {
+  private boolean canObtainExpectedTypeFrom(Method method) {
       return method.getName().equals(methodName)
               && method.getParameterTypes().length == expectedNumberOfParameters
               && !method.isSynthetic();
@@ -64,7 +64,7 @@ protected boolean canObtainExpectedTypeFrom(Method method) {
    * @param method The method from which to extract
    * @return The type we're looking for
    */
-  protected Class<?> expectedTypeFrom(Method method) {
+  private Class<?> expectedTypeFrom(Method method) {
       return method.getParameterTypes()[typedParameter];
   }
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/AbstractMatcherTest.java b/hamcrest-core/src/test/java/org/hamcrest/AbstractMatcherTest.java
@@ -56,12 +56,6 @@ public static void assertUnknownTypeSafe(Matcher<?> matcher) {
       }
   }
 
-  public static <T> String mismatchDescription(Matcher<? super T> matcher, T arg) {
-    Description description = new StringDescription();
-    matcher.describeMismatch(arg, description);
-    return description.toString().trim();
-  }
-
   public void testIsNullSafe() {
     assertNullSafe(createMatcher());
   }
@@ -70,6 +64,13 @@ public void testCopesWithUnknownTypes() {
     createMatcher().matches(new UnknownType());
   }
 
+    private static <T> String mismatchDescription(Matcher<? super T> matcher, T arg) {
+      Description description = new StringDescription();
+      matcher.describeMismatch(arg, description);
+      return description.toString().trim();
+    }
+
+  @SuppressWarnings("WeakerAccess")
   public static class UnknownType {
   }
 
diff --git a/hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java b/hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java
@@ -81,6 +81,8 @@ public int getInt() {
     public Value getValue() {
       return valueProperty;
     }
+
+    @Override public String toString() { return "an ExampleBean"; }
   }
   
   public static class SubBeanWithNoExtraProperties extends ExampleBean {

Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,6 @@ public static void assertUnknownTypeSafe(Matcher<?> matcher) {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- public static <T> String mismatchDescription(Matcher<? super T> matcher, T arg) {`
`60`		`- Description description = new StringDescription();`
`61`		`- matcher.describeMismatch(arg, description);`
`62`		`- return description.toString().trim();`
`63`		`- }`
`64`		`-`
`65`	`59`	`public void testIsNullSafe() {`
`66`	`60`	`assertNullSafe(createMatcher());`
`67`	`61`	`}`
`@@ -70,6 +64,13 @@ public void testCopesWithUnknownTypes() {`
`70`	`64`	`createMatcher().matches(new UnknownType());`
`71`	`65`	`}`
`72`	`66`
	`67`	`+ private static <T> String mismatchDescription(Matcher<? super T> matcher, T arg) {`
	`68`	`+ Description description = new StringDescription();`
	`69`	`+ matcher.describeMismatch(arg, description);`
	`70`	`+ return description.toString().trim();`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ @SuppressWarnings("WeakerAccess")`
`73`	`74`	`public static class UnknownType {`
`74`	`75`	`}`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ public int getInt() {`
`81`	`81`	`public Value getValue() {`
`82`	`82`	`return valueProperty;`
`83`	`83`	`}`
	`84`	`+`
	`85`	`+ @Override public String toString() { return "an ExampleBean"; }`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`public static class SubBeanWithNoExtraProperties extends ExampleBean {`