Fixed generic type inference issues of the Java compiler which requir…

…ed an explicit bound set explicitly and could not infere it.

byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java

@@ -4,7 +4,6 @@
 import net.bytebuddy.description.NamedElement;
 import net.bytebuddy.description.annotation.AnnotationDescription;
 import net.bytebuddy.description.annotation.AnnotationList;
-import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.description.type.generic.GenericTypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;

byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Morph.java

@@ -13,7 +13,6 @@
 import net.bytebuddy.dynamic.scaffold.MethodLookupEngine;
 import net.bytebuddy.dynamic.scaffold.subclass.ConstructorStrategy;
 import net.bytebuddy.implementation.Implementation;
-import net.bytebuddy.implementation.MethodDelegation;
 import net.bytebuddy.implementation.auxiliary.AuxiliaryType;
 import net.bytebuddy.implementation.bind.MethodDelegationBinder;
 import net.bytebuddy.implementation.bytecode.ByteCodeAppender;

byte-buddy-dep/src/main/java/net/bytebuddy/matcher/DeclaringFieldMatcher.java

@@ -1,14 +1,16 @@
 package net.bytebuddy.matcher;
 
+import net.bytebuddy.description.field.FieldDescription;
 import net.bytebuddy.description.field.FieldList;
 import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.description.type.generic.GenericTypeDescription;
 
 /**
  * An element matcher that checks if a type description declares fields of a given property.
  *
  * @param <T> The exact type of the annotated element that is matched.
  */
-public class DeclaringFieldMatcher<T extends TypeDescription> extends ElementMatcher.Junction.AbstractBase<T> {
+public class DeclaringFieldMatcher<T extends GenericTypeDescription> extends ElementMatcher.Junction.AbstractBase<T> {
 
     /**
      * The field matcher to apply to the declared fields of the matched type description.
@@ -20,7 +22,7 @@ public class DeclaringFieldMatcher<T extends TypeDescription> extends ElementMat
      *
      * @param fieldMatcher The field matcher to apply to the declared fields of the matched type description.
      */
-    public DeclaringFieldMatcher(ElementMatcher<? super FieldList<?>> fieldMatcher) {
+    public DeclaringFieldMatcher(ElementMatcher<? super FieldList<? extends FieldDescription>> fieldMatcher) {
         this.fieldMatcher = fieldMatcher;
     }
 

byte-buddy-dep/src/main/java/net/bytebuddy/matcher/DeclaringMethodMatcher.java

@@ -1,14 +1,17 @@
 package net.bytebuddy.matcher;
 
+import net.bytebuddy.description.field.FieldDescription;
+import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.method.MethodList;
 import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.description.type.generic.GenericTypeDescription;
 
 /**
  * An element matcher that checks if a type description declares methods of a given property.
  *
  * @param <T> The exact type of the annotated element that is matched.
  */
-public class DeclaringMethodMatcher<T extends TypeDescription> extends ElementMatcher.Junction.AbstractBase<T> {
+public class DeclaringMethodMatcher<T extends GenericTypeDescription> extends ElementMatcher.Junction.AbstractBase<T> {
 
     /**
      * The field matcher to apply to the declared fields of the matched type description.
@@ -20,7 +23,7 @@ public class DeclaringMethodMatcher<T extends TypeDescription> extends ElementMa
      *
      * @param methodMatcher The method matcher to apply to the declared methods of the matched type description.
      */
-    public DeclaringMethodMatcher(ElementMatcher<? super MethodList<?>> methodMatcher) {
+    public DeclaringMethodMatcher(ElementMatcher<? super MethodList<? extends MethodDescription>> methodMatcher) {
         this.methodMatcher = methodMatcher;
     }
 

byte-buddy-dep/src/main/java/net/bytebuddy/matcher/ElementMatchers.java

@@ -996,7 +996,8 @@ public static <T extends MethodDescription> ElementMatcher.Junction<T> hasParame
      * @param <T>     The type of the matched object.
      * @return A matcher that matches a method description's parameters against the given constraint.
      */
-    public static <T extends MethodDescription> ElementMatcher.Junction<T> hasParameters(ElementMatcher<? super Iterable<? extends ParameterDescription>> matcher) {
+    public static <T extends MethodDescription> ElementMatcher.Junction<T> hasParameters(
+            ElementMatcher<? super Iterable<? extends ParameterDescription>> matcher) {
         return new MethodParameterMatcher<T>(nonNull(matcher));
     }
 
@@ -1448,7 +1449,7 @@ public static <T extends TypeDescription> ElementMatcher.Junction<T> hasAnnotati
      * @param <T>          The type of the matched object.
      * @return A matcher that matches any type where another matcher is matched positively on at least on declared field.
      */
-    public static <T extends TypeDescription> ElementMatcher.Junction<T> declaresField(ElementMatcher<? super FieldDescription> fieldMatcher) {
+    public static <T extends GenericTypeDescription> ElementMatcher.Junction<T> declaresField(ElementMatcher<? super FieldDescription> fieldMatcher) {
         return new DeclaringFieldMatcher<T>(new CollectionItemMatcher<FieldDescription>(nonNull(fieldMatcher)));
     }
 
@@ -1459,7 +1460,7 @@ public static <T extends TypeDescription> ElementMatcher.Junction<T> declaresFie
      * @param <T>           The type of the matched object.
      * @return A matcher that matches any type where another matcher is matched positively on at least on declared methods.
      */
-    public static <T extends TypeDescription> ElementMatcher.Junction<T> declaresMethod(ElementMatcher<? super MethodDescription> methodMatcher) {
+    public static <T extends GenericTypeDescription> ElementMatcher.Junction<T> declaresMethod(ElementMatcher<? super MethodDescription> methodMatcher) {
         return new DeclaringMethodMatcher<T>(new CollectionItemMatcher<MethodDescription>(nonNull(methodMatcher)));
     }
 

byte-buddy-dep/src/main/java/net/bytebuddy/matcher/MethodParameterMatcher.java

@@ -1,6 +1,7 @@
 package net.bytebuddy.matcher;
 
 import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.method.ParameterDescription;
 import net.bytebuddy.description.method.ParameterList;
 
 /**
@@ -20,7 +21,7 @@ public class MethodParameterMatcher<T extends MethodDescription> extends Element
      *
      * @param parameterMatcher The matcher to apply to the parameters.
      */
-    public MethodParameterMatcher(ElementMatcher<? super ParameterList<?>> parameterMatcher) {
+    public MethodParameterMatcher(ElementMatcher<? super ParameterList<? extends ParameterDescription>> parameterMatcher) {
         this.parameterMatcher = parameterMatcher;
     }
 

checkstyle.xml

@@ -20,9 +20,9 @@
 
         <!-- Checkstyle has a bug that disallows @return in annotation methods, enable only on demand -->
         <!--<module name="JavadocMethod"/>-->
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
+        <!--<module name="JavadocType"/>-->
+        <!--<module name="JavadocVariable"/>-->
+        <!--<module name="JavadocStyle"/>-->
 
         <module name="TodoComment"/>