Sync with databind/5244 wrt Guice module (#307)

Author: cowtowncoder

guice/src/main/java/tools/jackson/module/guice/GuiceAnnotationIntrospector.java

@@ -1,15 +1,15 @@
 package tools.jackson.module.guice;
 
+import java.lang.annotation.Annotation;
+import java.util.stream.Stream;
+import javax.inject.Qualifier;
+
 import com.fasterxml.jackson.annotation.JacksonInject;
 import tools.jackson.databind.cfg.MapperConfig;
 import tools.jackson.databind.introspect.*;
 import com.google.inject.BindingAnnotation;
 import com.google.inject.Key;
 
-import javax.inject.Qualifier;
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-
 public class GuiceAnnotationIntrospector extends NopAnnotationIntrospector
 {
     private static final long serialVersionUID = 1L;
@@ -50,8 +50,7 @@ private Object _findGuiceInjectId(AnnotatedMember m)
             // On fields and parameters the @Qualifier annotation and type to
             // inject are the member itself, so, nothing to do here...
             guiceMember = m;
-            AnnotationMap anns = ((AnnotatedMember) m).getAllAnnotations();
-            guiceAnnotation = findBindingAnnotation(anns.annotations());
+            guiceAnnotation = findBindingAnnotation(m.annotations());
         } else if (m instanceof AnnotatedMethod) {
            /* For method injection, the @Qualifier and type to inject are
             * specified on the parameter. Here, we only consider methods with
@@ -68,7 +67,7 @@ private Object _findGuiceInjectId(AnnotatedMember m)
             */
             guiceMember = a.getParameter(0);
             final Annotation[] annotations = a.getMember().getParameterAnnotations()[0];
-            guiceAnnotation = findBindingAnnotation(Arrays.asList(annotations));
+            guiceAnnotation = findBindingAnnotation(Stream.of(annotations));
         } else {
             /* Ignore constructors */
             return null;
@@ -93,16 +92,14 @@ private Object _findGuiceInjectId(AnnotatedMember m)
      * annotation are present on what we're trying to inject.
      * Those annotations are only possible on fields or parameters.
      */
-    private Annotation findBindingAnnotation(Iterable<Annotation> annotations)
+    private Annotation findBindingAnnotation(Stream<Annotation> annotations)
     {
-        for (Annotation annotation : annotations) {
-            // Check on guice (BindingAnnotation) & javax (Qualifier) based injections
-            if (annotation.annotationType().isAnnotationPresent(BindingAnnotation.class) ||
-                annotation.annotationType().isAnnotationPresent(Qualifier.class))
-            {
-                return annotation;
-            }
-        }
-        return null;
+        return annotations.filter(ann ->  {
+            Class<?> type = ann.annotationType();
+            return type.isAnnotationPresent(BindingAnnotation.class)
+                    || type.isAnnotationPresent(Qualifier.class);
+        })
+        .findFirst()
+        .orElse(null);
     }
 }

guice7/src/main/java/tools/jackson/module/guice7/GuiceAnnotationIntrospector.java

@@ -11,6 +11,7 @@
 import jakarta.inject.Qualifier;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
+import java.util.stream.Stream;
 
 public class GuiceAnnotationIntrospector extends NopAnnotationIntrospector
 {
@@ -53,8 +54,7 @@ private Object _findGuiceInjectId(AnnotatedMember m)
             * inject are the member itself, so, nothing to do here...
             */
             guiceMember = m;
-            AnnotationMap anns = ((AnnotatedMember) m).getAllAnnotations();
-            guiceAnnotation = findBindingAnnotation(anns.annotations());
+            guiceAnnotation = findBindingAnnotation(m.annotations());
         } else if (m instanceof AnnotatedMethod) {
            /* For method injection, the @Qualifier and type to inject are
             * specified on the parameter. Here, we only consider methods with
@@ -71,7 +71,7 @@ private Object _findGuiceInjectId(AnnotatedMember m)
             */
             guiceMember = a.getParameter(0);
             final Annotation[] annotations = a.getMember().getParameterAnnotations()[0];
-            guiceAnnotation = findBindingAnnotation(Arrays.asList(annotations));
+            guiceAnnotation = findBindingAnnotation(Stream.of(annotations));
         } else {
             /* Ignore constructors */
             return null;
@@ -96,16 +96,14 @@ private Object _findGuiceInjectId(AnnotatedMember m)
      * annotation are present on what we're trying to inject.
      * Those annotations are only possible on fields or parameters.
      */
-    private Annotation findBindingAnnotation(Iterable<Annotation> annotations)
+    private Annotation findBindingAnnotation(Stream<Annotation> annotations)
     {
-        for (Annotation annotation : annotations) {
-            // Check on guice (BindingAnnotation) & jakarta (Qualifier) based injections
-            if (annotation.annotationType().isAnnotationPresent(BindingAnnotation.class) ||
-                annotation.annotationType().isAnnotationPresent(Qualifier.class))
-            {
-                return annotation;
-            }
-        }
-        return null;
+        return annotations.filter(ann ->  {
+            Class<?> type = ann.annotationType();
+            return type.isAnnotationPresent(BindingAnnotation.class)
+                    || type.isAnnotationPresent(Qualifier.class);
+        })
+        .findFirst()
+        .orElse(null);
     }
 }