Add annotation removal.

Author: raphw

byte-buddy-dep/src/main/java/net/bytebuddy/asm/AnnotationRemoval.java

@@ -169,7 +169,7 @@ public MethodVisitor visitMethod(int modifiers, String internalName, String desc
                 Map<Integer, Map<String, AnnotationDescription>> mappedParameterAnnotations = new HashMap<Integer, Map<String, AnnotationDescription>>();
                 for (ParameterDescription parameter : methodDescription.getParameters()) {
                     Map<String, AnnotationDescription> mappedAnnotations = new HashMap<String, AnnotationDescription>();
-                    for (AnnotationDescription annotation : methodDescription.getDeclaredAnnotations()) {
+                    for (AnnotationDescription annotation : parameter.getDeclaredAnnotations()) {
                         mappedAnnotations.put(annotation.getAnnotationType().getDescriptor(), annotation);
                     }
                     mappedParameterAnnotations.put(parameter.getIndex(), mappedAnnotations);

byte-buddy-dep/src/test/java/net/bytebuddy/asm/AnnotationRemovalTest.java

@@ -28,6 +28,7 @@ public void testRemoval() throws Exception {
         assertThat(type.getAnnotations().length, is(0));
         assertThat(type.getDeclaredField(FOO).getAnnotations().length, is(0));
         assertThat(type.getDeclaredConstructor().getAnnotations().length, is(0));
+        assertThat(type.getDeclaredMethod(FOO, Void.class).getParameterAnnotations()[0].length, is(0));
         assertThat(type.getDeclaredMethod(BAR).getAnnotations().length, is(0));
     }
 
@@ -42,6 +43,7 @@ public void testRemovalOnType() throws Exception {
         assertThat(type.getAnnotations().length, is(0));
         assertThat(type.getDeclaredField(FOO).getAnnotations().length, is(1));
         assertThat(type.getDeclaredConstructor().getAnnotations().length, is(1));
+        assertThat(type.getDeclaredMethod(FOO, Void.class).getParameterAnnotations()[0].length, is(1));
         assertThat(type.getDeclaredMethod(BAR).getAnnotations().length, is(1));
     }
 
@@ -56,6 +58,7 @@ public void testRemovalOnField() throws Exception {
         assertThat(type.getAnnotations().length, is(1));
         assertThat(type.getDeclaredField(FOO).getAnnotations().length, is(0));
         assertThat(type.getDeclaredConstructor().getAnnotations().length, is(1));
+        assertThat(type.getDeclaredMethod(FOO, Void.class).getParameterAnnotations()[0].length, is(1));
         assertThat(type.getDeclaredMethod(BAR).getAnnotations().length, is(1));
     }
 
@@ -70,6 +73,7 @@ public void testRemovalOnConstructor() throws Exception {
         assertThat(type.getAnnotations().length, is(1));
         assertThat(type.getDeclaredField(FOO).getAnnotations().length, is(1));
         assertThat(type.getDeclaredConstructor().getAnnotations().length, is(0));
+        assertThat(type.getDeclaredMethod(FOO, Void.class).getParameterAnnotations()[0].length, is(1));
         assertThat(type.getDeclaredMethod(BAR).getAnnotations().length, is(1));
     }
 
@@ -84,9 +88,25 @@ public void testRemovalOnMethod() throws Exception {
         assertThat(type.getAnnotations().length, is(1));
         assertThat(type.getDeclaredField(FOO).getAnnotations().length, is(1));
         assertThat(type.getDeclaredConstructor().getAnnotations().length, is(1));
+        assertThat(type.getDeclaredMethod(FOO, Void.class).getParameterAnnotations()[0].length, is(1));
         assertThat(type.getDeclaredMethod(BAR).getAnnotations().length, is(0));
     }
 
+    @Test
+    public void testRemovalOnMethodParameter() throws Exception {
+        Class<?> type = new ByteBuddy()
+                .redefine(Sample.class)
+                .visit(AnnotationRemoval.strip(ElementMatchers.annotationType(named(SampleAnnotation.class.getName()))).onMethods(named(FOO)))
+                .make()
+                .load(SampleAnnotation.class.getClassLoader(), ClassLoadingStrategy.Default.CHILD_FIRST_PERSISTENT)
+                .getLoaded();
+        assertThat(type.getAnnotations().length, is(1));
+        assertThat(type.getDeclaredField(FOO).getAnnotations().length, is(1));
+        assertThat(type.getDeclaredConstructor().getAnnotations().length, is(1));
+        assertThat(type.getDeclaredMethod(FOO, Void.class).getParameterAnnotations()[0].length, is(0));
+        assertThat(type.getDeclaredMethod(BAR).getAnnotations().length, is(1));
+    }
+
     @SampleAnnotation
     private static class Sample {