Polish gh-4081 (#5495)

Author: izeye

micrometer-commons/src/main/java/io/micrometer/common/annotation/AnnotationHandler.java

@@ -23,14 +23,10 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-import java.util.function.Predicate;
 
 /**
  * This class is able to find all methods annotated with the Micrometer annotations. All
@@ -138,15 +134,13 @@ private boolean methodsAreTheSame(Method mostSpecificMethod, Method method) {
     }
 
     private void addAnnotatedArguments(T objectToModify, List<AnnotatedParameter> toBeAdded) {
-        toBeAdded.stream()
-            .map(container -> toKeyValue.apply(container.annotation, container.argument))
-            .filter(distinctByKey(KeyValue::getKey))
-            .forEach(keyValue -> keyValueConsumer.accept(keyValue, objectToModify));
-    }
-
-    private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
-        Map<Object, Boolean> seen = new ConcurrentHashMap<>();
-        return item -> seen.putIfAbsent(keyExtractor.apply(item), Boolean.TRUE) == null;
+        Set<String> seen = new HashSet<>();
+        for (AnnotatedParameter container : toBeAdded) {
+            KeyValue keyValue = toKeyValue.apply(container.annotation, container.argument);
+            if (seen.add(keyValue.getKey())) {
+                keyValueConsumer.accept(keyValue, objectToModify);
+            }
+        }
     }
 
     public Function<Class<? extends ValueResolver>, ? extends ValueResolver> getResolverProvider() {

micrometer-commons/src/main/java/io/micrometer/common/annotation/AnnotationUtils.java

@@ -18,8 +18,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.util.Arrays;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,14 +38,12 @@ private AnnotationUtils() {
     static List<AnnotatedParameter> findAnnotatedParameters(Class<? extends Annotation> annotationClazz, Method method,
             Object[] args) {
         Parameter[] parameters = method.getParameters();
-        List<AnnotatedParameter> result = new LinkedList<>();
+        List<AnnotatedParameter> result = new ArrayList<>();
         for (int i = 0; i < parameters.length; i++) {
             Parameter parameter = parameters[i];
-            Annotation[] annotations = parameter.getAnnotationsByType(annotationClazz);
-            final int parameterIndex = i;
-            Arrays.stream(annotations)
-                .map(annotation -> new AnnotatedParameter(annotation, args[parameterIndex]))
-                .forEach(result::add);
+            for (Annotation annotation : parameter.getAnnotationsByType(annotationClazz)) {
+                result.add(new AnnotatedParameter(annotation, args[i]));
+            }
         }
         return result;
     }

micrometer-core/src/test/java/io/micrometer/core/aop/TimedAspectTest.java

@@ -546,7 +546,7 @@ void multipleMeterTagsWithinContainerWithExpression(AnnotatedTestClass annotated
             assertThat(registry.get("method.timed")
                 .tag("value1", "value1: zxe")
                 .tag("value2", "value2: qwe")
-                .tag("value3", "value3: ZXEQWE")
+                .tag("value3", "value3. overridden: ZXEQWE")
                 .timer()
                 .count()).isEqualTo(1);
         }
@@ -670,7 +670,7 @@ public void getMultipleAnnotationsForTagValueExpression(
         public void getMultipleAnnotationsWithContainerForTagValueExpression(@MeterTags({
                 @MeterTag(key = "value1", expression = "'value1: ' + value1"),
                 @MeterTag(key = "value2", expression = "'value2: ' + value2"), @MeterTag(key = "value3",
-                        expression = "'value3: ' + value1.toUpperCase + value2.toUpperCase") }) DataHolder param) {
+                        expression = "'value3. overridden: ' + value1.toUpperCase + value2.toUpperCase") }) DataHolder param) {
         }
 
     }
@@ -697,13 +697,12 @@ public void getAnnotationForArgumentToString(Long param) {
         @Override
         public void getMultipleAnnotationsForTagValueExpression(
                 @MeterTag(key = "value2", expression = "'value2. overridden: ' + value2") DataHolder param) {
-
         }
 
         @Timed
         @Override
-        public void getMultipleAnnotationsWithContainerForTagValueExpression(DataHolder param) {
-
+        public void getMultipleAnnotationsWithContainerForTagValueExpression(@MeterTag(key = "value3",
+                expression = "'value3. overridden: ' + value1.toUpperCase + value2.toUpperCase") DataHolder param) {
         }
 
     }