Fixed more tests that broke because of new API.

byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java

@@ -1915,6 +1915,7 @@ public Builder define(String property, TypeDescription typeDescription) {
          * @param <T>             The enumeration type.
          * @return A builder with the additional class property.
          */
+        @SuppressWarnings("unchecked")
         public <T extends Enum<?>> Builder defineEnumerationArray(String property, Class<T> enumerationType, T... value) {
             EnumerationDescription[] enumerationDescription = new EnumerationDescription[value.length];
             int index = 0;
@@ -1965,6 +1966,7 @@ public Builder defineEnumerationArray(String property, TypeDescription enumerati
          * @param <T>            The annotation type.
          * @return A builder with the additional annotation property.
          */
+        @SuppressWarnings("unchecked")
         public <T extends Annotation> Builder defineAnnotationArray(String property, Class<T> annotationType, T... annotation) {
             return defineAnnotationArray(property,
                     new TypeDescription.ForLoadedType(annotationType),

byte-buddy-dep/src/main/java/net/bytebuddy/description/modifier/ModifierContributor.java

@@ -76,10 +76,22 @@ protected Resolver(Collection<? extends T> modifierContributors) {
             this.modifierContributors = modifierContributors;
         }
 
-        public static <S extends ModifierContributor> Resolver<S> of(S... modifierContributor) {
+        public static Resolver<ForType> of(ForType... modifierContributor) {
             return of(Arrays.asList(modifierContributor));
         }
 
+        public static Resolver<ForField> of(ForField... modifierContributor) {
+            return of(Arrays.asList(modifierContributor));
+        }
+
+        public static Resolver<ForMethod> of(ForMethod... modifierContributor) {
+            return of(Arrays.asList(modifierContributor));
+        }
+
+        public static Resolver<ForParameter> of(ForParameter... modifierContributor) {
+            return Resolver.of(Arrays.asList(modifierContributor));
+        }
+
         public static <S extends ModifierContributor> Resolver<S> of(Collection<? extends S> modifierContributors) {
             return new Resolver<S>(modifierContributors);
         }

byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/DynamicType.java

@@ -1740,7 +1740,7 @@ public MethodDefinition<U> annotateMethod(Collection<? extends AnnotationDescrip
                                     token.getReturnType(),
                                     token.getParameterTokens(),
                                     token.getExceptionTypes(),
-                                    token.getAnnotations(),
+                                    CompoundList.of(token.getAnnotations(), new ArrayList<AnnotationDescription>(annotations)),
                                     token.getDefaultValue())).new AnnotationAdapter(handler, methodAttributeAppenderFactory, methodTransformer);
                         }
 

byte-buddy-dep/src/test/java/net/bytebuddy/dynamic/scaffold/subclass/ConstructorStrategyDefaultTest.java

@@ -33,9 +33,6 @@ public class ConstructorStrategyDefaultTest {
     @Mock
     private MethodRegistry methodRegistry;
 
-    @Mock
-    private MethodAttributeAppender.Factory methodAttributeAppenderFactory;
-
     @Mock
     private InstrumentedType instrumentedType;
 
@@ -77,7 +74,7 @@ public void testImitateSuperTypeStrategy() throws Exception {
         assertThat(ConstructorStrategy.Default.IMITATE_SUPER_TYPE.inject(methodRegistry), is(methodRegistry));
         verify(methodRegistry).append(any(LatentMatcher.class),
                 any(MethodRegistry.Handler.class),
-                eq(methodAttributeAppenderFactory),
+                eq(MethodAttributeAppender.ForInstrumentedMethod.INSTANCE),
                 eq(MethodTransformer.NoOp.INSTANCE));
         verifyNoMoreInteractions(methodRegistry);
         verify(instrumentedType, atLeastOnce()).getSuperType();
@@ -93,7 +90,7 @@ public void testImitateSuperTypePublicStrategy() throws Exception {
         assertThat(ConstructorStrategy.Default.IMITATE_SUPER_TYPE_PUBLIC.inject(methodRegistry), is(methodRegistry));
         verify(methodRegistry).append(any(LatentMatcher.class),
                 any(MethodRegistry.Handler.class),
-                eq(methodAttributeAppenderFactory),
+                eq(MethodAttributeAppender.ForInstrumentedMethod.INSTANCE),
                 eq(MethodTransformer.NoOp.INSTANCE));
         verifyNoMoreInteractions(methodRegistry);
         verify(instrumentedType, atLeastOnce()).getSuperType();
@@ -110,7 +107,7 @@ public void testDefaultConstructorStrategy() throws Exception {
         assertThat(ConstructorStrategy.Default.DEFAULT_CONSTRUCTOR.inject(methodRegistry), is(methodRegistry));
         verify(methodRegistry).append(any(LatentMatcher.class),
                 any(MethodRegistry.Handler.class),
-                eq(methodAttributeAppenderFactory),
+                eq(MethodAttributeAppender.NoOp.INSTANCE),
                 eq(MethodTransformer.NoOp.INSTANCE));
         verifyNoMoreInteractions(methodRegistry);
         verify(instrumentedType, atLeastOnce()).getSuperType();