warnings cleanup

Author: cowtowncoder

Diff for: src/main/java/com/fasterxml/classmate/TypeResolver.java

@@ -7,7 +7,6 @@
 import com.fasterxml.classmate.types.*;
 import com.fasterxml.classmate.util.ClassKey;
 import com.fasterxml.classmate.util.ClassStack;
-import com.fasterxml.classmate.util.LRUTypeCache;
 import com.fasterxml.classmate.util.ResolvedTypeCache;
 import com.fasterxml.classmate.util.ResolvedTypeKey;
 

Diff for: src/test/java/com/fasterxml/classmate/ResolvedTypeTest.java

@@ -14,11 +14,11 @@ public class ResolvedTypeTest extends BaseTest
 {
     // For [Issue#16]
 
-    private static class Foo16 extends Bar16 { }
+    static class Foo16 extends Bar16 { }
 
-    private static class Bar16 extends Zen16<Bar16, Foo16> { }
+    static class Bar16 extends Zen16<Bar16, Foo16> { }
 
-    private static class Zen16<A, B extends A>  { }
+    static class Zen16<A, B extends A>  { }
 
     @Test
     public void testCanCreateSubtype() {

Diff for: src/test/java/com/fasterxml/classmate/ResolvedTypeWithMembersTest.java

@@ -20,32 +20,32 @@
 public class ResolvedTypeWithMembersTest {
 
     @Retention(RetentionPolicy.RUNTIME)
-    private static @interface Marker { }
+    static @interface Marker { }
 
     @Retention(RetentionPolicy.RUNTIME)
-    private static @interface MarkerB { }
+    static @interface MarkerB { }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Inherited
-    private static @interface MarkerC { }
+    static @interface MarkerC { }
 
     @SuppressWarnings("unused")
-    private static class MixinCandidate {
+    static class MixinCandidate {
         private static void staticOverride() { }
         private String shadowed;
         private MixinCandidate() { }
         protected String getShadowed() { return shadowed; }
     }
 
-    private static class MixinA {
+    static class MixinA {
         @Marker
         private static void staticOverride() { }
 
         @Marker
         private String shadowed;
 
         @Marker
-        private MixinA() { }
+        MixinA() { }
 
         @Marker
         protected String getShadowed() { return shadowed; }
@@ -54,17 +54,17 @@ private MixinA() { }
         protected String inherited() { return ""; }
     }
 
-    private static class MixinB {
+    static class MixinB {
         @MarkerB
         protected String getShadowed() { return null; }
     }
 
-    private static class MixinC {
+    static class MixinC {
         @MarkerB
         protected String getShadowed() { return null; }
     }
 
-    private static class MixinD {
+    static class MixinD {
 
         @Marker
         private String field;
@@ -76,7 +76,7 @@ private MixinD() { }
         protected String getShadowed() { return null; }
     }
 
-    private static class MixinASubclass extends MixinA {
+    static class MixinASubclass extends MixinA {
 
         @Override protected String getShadowed() { return super.getShadowed(); }
 

Diff for: src/test/java/com/fasterxml/classmate/members/ResolvedConstructorTest.java

@@ -6,12 +6,11 @@
 
 import java.lang.reflect.Constructor;
 
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
 
 /**
  * @author blangel
  */
-@SuppressWarnings("deprecation")
 public class ResolvedConstructorTest {
 
     private static final Constructor<String> stringConstructor;
@@ -25,7 +24,6 @@ public class ResolvedConstructorTest {
         }
     }
 
-    @SuppressWarnings("unused")
     @Test
     public void init() {
         try {

Diff for: src/test/java/com/fasterxml/classmate/util/ClassKeyTest.java

@@ -2,21 +2,20 @@
 
 import org.junit.Test;
 
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
 
 /**
  * @author blangel
  */
-@SuppressWarnings({ "serial", "deprecation" })
+@SuppressWarnings({ "serial" })
 public class ClassKeyTest
 {
-    private static class ClassKeySubclass extends ClassKey {
-        private ClassKeySubclass(Class<?> clz) {
+    static class ClassKeySubclass extends ClassKey {
+        ClassKeySubclass(Class<?> clz) {
             super(clz);
         }
     }
 
-    @SuppressWarnings("unused")
     @Test
     public void nullClass() {
         try {

Diff for: src/test/java/com/fasterxml/classmate/util/MethodKeyTest.java

@@ -2,14 +2,13 @@
 
 import org.junit.Test;
 
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
 
-@SuppressWarnings("deprecation")
 public class MethodKeyTest {
 
     @SuppressWarnings("serial")
     private static class MethodKeySubclass extends MethodKey {
-        private MethodKeySubclass(String name) {
+        MethodKeySubclass(String name) {
             super(name);
         }
     }
@@ -25,7 +24,7 @@ public void equals() {
         assertFalse(key1.equals(null));
 
         // test unequal class
-        assertFalse(key1.equals("test"));
+        assertFalse(key1.equals((Object) "test"));
 
         // test subclass
         MethodKeySubclass methodKeySubclass = new MethodKeySubclass("test");

Diff for: src/test/java/com/fasterxml/classmate/util/TestResolvedTypeCache.java

@@ -12,8 +12,8 @@
 
 public class TestResolvedTypeCache extends TestCase
 {
-    private static class KeySubclass extends ResolvedTypeKey {
-        private KeySubclass(Class<?> simpleType) {
+    static class KeySubclass extends ResolvedTypeKey {
+        KeySubclass(Class<?> simpleType) {
             super(simpleType);
         }
     }
@@ -68,7 +68,6 @@ private void _testSimple(ResolvedTypeCache cache, boolean lru) {
         }
     }
 
-    @SuppressWarnings("unused")
     public void testKeyEquals()
     {
         try {