@@ -34,20 +34,22 @@ private static boolean annotatedSuperMethod(ExecutableElement element, Object ma
34
34
var methodName = element .getSimpleName ();
35
35
final Types types = APContext .types ();
36
36
return types .directSupertypes (element .getEnclosingElement ().asType ()).stream ()
37
- .filter (type -> !type .toString ().contains ("java.lang.Object" ))
38
- .map (
39
- superType -> {
40
- final var superClass = (TypeElement ) types .asElement (superType );
41
- for (final var method : ElementFilter .methodsIn (superClass .getEnclosedElements ())) {
42
- if (method .getSimpleName ().contentEquals (methodName )
43
- && method .getParameters ().size () == element .getParameters ().size ()) {
44
- return method ;
45
- }
46
- }
47
- return null ;
48
- })
49
- .filter (Objects ::nonNull )
50
- .flatMap (m -> APContext .elements ().getAllAnnotationMirrors (m ).stream ())
51
- .anyMatch (m -> matchShortName .equals (shortName (m .getAnnotationType ().asElement ())));
37
+ .filter (type -> !type .toString ().contains ("java.lang.Object" ))
38
+ .map (superType -> {
39
+ final var superClass = (TypeElement ) types .asElement (superType );
40
+ for (final var method : ElementFilter .methodsIn (superClass .getEnclosedElements ())) {
41
+ if (matchNameAndParams (element , method , methodName )) {
42
+ return method ;
43
+ }
44
+ }
45
+ return null ;
46
+ })
47
+ .filter (Objects ::nonNull )
48
+ .flatMap (m -> APContext .elements ().getAllAnnotationMirrors (m ).stream ())
49
+ .anyMatch (m -> matchShortName .equals (shortName (m .getAnnotationType ().asElement ())));
50
+ }
51
+
52
+ private static boolean matchNameAndParams (ExecutableElement element , ExecutableElement method , javax .lang .model .element .Name methodName ) {
53
+ return method .getSimpleName ().contentEquals (methodName ) && method .getParameters ().size () == element .getParameters ().size ();
52
54
}
53
55
}
0 commit comments