commit e084e6415cc3ac1535a20e72ec0f5e143f4f1186
author Matthew Jason Benson <mbenson@apache.org> Thu Mar 27 22:36:19 2014 +0000
committer Matthew Jason Benson <mbenson@apache.org> Thu Mar 27 22:36:19 2014 +0000
tree c2c3a964163ca50b42b84f878c070761ef612988
parent 1cc4c72aceba5cc3a862b98924f9f1a83a5f0b5b

fix generics

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/trunk@1582521 13f79535-47bb-0310-9956-ffa450edef68

core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java

diff --git a/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java b/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
index 0796b62..bc34308 100644
--- a/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
+++ b/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
@@ -43,12 +43,12 @@
         return new EqualsMatcher<T>(value);
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> gt(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> gt(C comparable)
     {
         return new GreaterThanMatcher<C>(comparable);
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> gte(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> gte(C comparable)
     {
         return new GreaterThanOrEqualMatcher<C>(comparable);
     }
@@ -63,12 +63,12 @@
         return new IsNullMatcher<T>();
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> lt(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> lt(C comparable)
     {
         return new LessThanMatcher<C>(comparable);
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> lte(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> lte(C comparable)
     {
         return new LessThanOrEqualMatcher<C>(comparable);
     }
@@ -110,7 +110,7 @@
         }
     }
 
-    private abstract static class ComparatorMatcher<C extends Comparable<?>> implements ArgumentMatcher<C>
+    private abstract static class ComparatorMatcher<C extends Comparable<C>> implements ArgumentMatcher<C>
     {
         private final C comparable;
 
@@ -122,15 +122,13 @@
         protected abstract boolean evaluate(int comparison);
 
         @Override
-        @SuppressWarnings("unchecked")
         public boolean matches(C argument)
         {
             if (argument == null)
             {
                 return false;
             }
-            @SuppressWarnings("rawtypes")
-            final int comparison = ((Comparable) comparable).compareTo(argument);
+            final int comparison = (comparable).compareTo(argument);
             return evaluate(comparison);
         }
     }
@@ -168,7 +166,7 @@
         }
     }
 
-    private static final class GreaterThanMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class GreaterThanMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private GreaterThanMatcher(C comparable)
         {
@@ -182,7 +180,7 @@
         }
     }
 
-    private static final class GreaterThanOrEqualMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class GreaterThanOrEqualMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private GreaterThanOrEqualMatcher(C comparable)
         {
@@ -221,7 +219,7 @@
         }
     }
 
-    private static final class LessThanMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class LessThanMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private LessThanMatcher(C comparable)
         {
@@ -235,7 +233,7 @@
         }
     }
 
-    private static final class LessThanOrEqualMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class LessThanOrEqualMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private LessThanOrEqualMatcher(C comparable)
         {