Optimize annotation metadata resolution performance

benchmarks/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+    id "me.champeau.gradle.jmh" version "0.4.8"
+}
+
+dependencies {
+    annotationProcessor project(":inject-java")
+    annotationProcessor project(":validation")
+    compile project(":inject")
+    compile project(":validation")
+    compile project(":runtime")
+
+
+    jmh 'org.openjdk.jmh:jmh-core:1.21'
+    jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
+}
+jmh {
+    duplicateClassesStrategy = 'warn'
+    warmupIterations = 2
+    iterations = 4
+    fork = 1
+}

benchmarks/src/jmh/java/io/micronaut/core/annotation/AnnotationValueBenchmark.java

@@ -0,0 +1,4 @@
+package io.micronaut.core.annotation;
+
+public class AnnotationValueBenchmark {
+}

benchmarks/src/jmh/java/io/micronaut/core/convert/ConversionServiceBenchmark.java

@@ -0,0 +1,45 @@
+package io.micronaut.core.convert;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.net.URI;
+
+@State(Scope.Benchmark)
+public class ConversionServiceBenchmark {
+
+    ConversionService conversionService;
+
+    @Setup
+    public void prepare() {
+        conversionService = ConversionService.SHARED;
+    }
+
+    @Benchmark
+    public void convertCacheHit() {
+        conversionService.convert("10", Integer.class);
+    }
+
+    @Benchmark
+    public void convertCacheMiss() {
+        conversionService.convert(URI.create("http://test.com"), Integer.class);
+    }
+
+    public static void main(String[] args) throws RunnerException {
+        Options opt = new OptionsBuilder()
+                .include(".*" + ConversionServiceBenchmark.class.getSimpleName() + ".*")
+                .warmupIterations(3)
+                .measurementIterations(5)
+                .forks(1)
+//                .jvmArgs("-agentpath:/Applications/YourKit-Java-Profiler-2018.04.app/Contents/Resources/bin/mac/libyjpagent.jnilib")
+                .build();
+
+        new Runner(opt).run();
+    }
+}

build.gradle

@@ -547,7 +547,8 @@ subprojects { Project subproject ->
 
         if (
         !subproject.name.startsWith('test-') &&
-                !subproject.toString().contains('build-projects')
+                !subproject.toString().contains('build-projects') &&
+                        !subproject.toString().contains('benchmarks')
         ) {
 
             apply from: "${rootProject.rootDir}/gradle/publishing.gradle"

core/src/main/java/io/micronaut/core/annotation/AnnotationMetadata.java

@@ -19,6 +19,7 @@
 import io.micronaut.core.type.Argument;
 import io.micronaut.core.util.ArgumentUtils;
 import io.micronaut.core.util.ArrayUtils;
+import io.micronaut.core.util.StringUtils;
 import io.micronaut.core.value.OptionalValues;
 
 import javax.annotation.Nonnull;
@@ -456,7 +457,7 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
      * @return The {@link AnnotationValue}
      */
     @Override
-    default @Nonnull <T extends Annotation> Optional<AnnotationValue<T>> findAnnotation(@Nonnull Class<T> annotationClass) {
+    default @Nonnull <T extends Annotation> Optional<AnnotationValue<T>>    findAnnotation(@Nonnull Class<T> annotationClass) {
         ArgumentUtils.requireNonNull("annotationClass", annotationClass);
         Repeatable repeatable = annotationClass.getAnnotation(Repeatable.class);
         if (repeatable != null) {
@@ -551,7 +552,7 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
      * @param annotation The annotation
      * @return An {@link Optional} class
      */
-    default @Nonnull Optional<Class> classValue(@Nonnull String annotation) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull String annotation) {
         ArgumentUtils.requireNonNull("annotation", annotation);
         return classValue(annotation, VALUE_MEMBER);
     }
@@ -563,11 +564,13 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
      * @param member     The annotation member
      * @return An {@link Optional} class
      */
-    default @Nonnull Optional<Class> classValue(@Nonnull String annotation, @Nonnull String member) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull String annotation, @Nonnull String member) {
         ArgumentUtils.requireNonNull("annotation", annotation);
         ArgumentUtils.requireNonNull("member", member);
 
-        return getValue(annotation, member, Class.class);
+        Optional value = getValue(annotation, member, Class.class);
+        //noinspection unchecked
+        return value;
     }
 
     /**
@@ -576,10 +579,10 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
      * @param annotation The annotation
      * @return An {@link Optional} class
      */
-    default @Nonnull Optional<Class> classValue(@Nonnull Class<? extends Annotation> annotation) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull Class<? extends Annotation> annotation) {
         ArgumentUtils.requireNonNull("annotation", annotation);
 
-        return classValue(annotation.getName());
+        return classValue(annotation, VALUE_MEMBER);
     }
 
     /**
@@ -589,13 +592,15 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
      * @param member     The annotation member
      * @return An {@link Optional} class
      */
-    default @Nonnull Optional<Class> classValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
         ArgumentUtils.requireNonNull("annotation", annotation);
         ArgumentUtils.requireNonNull("member", member);
 
         return classValue(annotation.getName(), member);
     }
 
+
+
     /**
      * The value as an {@link OptionalInt} for the given annotation and member.
      *
@@ -611,6 +616,97 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
         return result.map(OptionalInt::of).orElseGet(OptionalInt::empty);
     }
 
+    /**
+     * The value as an {@link OptionalInt} for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @param member     The member
+     * @return THe {@link OptionalInt} value
+     */
+    default @Nonnull OptionalInt intValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        ArgumentUtils.requireNonNull("annotation", annotation);
+        return intValue(annotation.getName(), member);
+    }
+
+    /**
+     * The value as an {@link OptionalInt} for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @return THe {@link OptionalInt} value
+     */
+    default @Nonnull OptionalInt intValue(@Nonnull Class<? extends Annotation> annotation) {
+        ArgumentUtils.requireNonNull("annotation", annotation);
+        return intValue(annotation, VALUE_MEMBER);
+    }
+
+    /**
+     * The value as an optional string for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @param member     The member
+     * @return The string value if it is present
+     */
+    default @Nonnull Optional<String> stringValue(@Nonnull String annotation, @Nonnull String member) {
+        ArgumentUtils.requireNonNull("annotation", annotation);
+        ArgumentUtils.requireNonNull("member", member);
+
+        return getValue(annotation, member, String.class);
+    }
+
+    /**
+     * The value as an optional string for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @param member     The member
+     * @return The string value if it is present
+     */
+    default @Nonnull Optional<String> stringValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        ArgumentUtils.requireNonNull("annotation", annotation);
+        return stringValue(annotation.getName(), member);
+    }
+
+    /**
+     * The values as string array for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @param member     The member
+     * @return The string values if it is present
+     */
+    default @Nonnull String[] stringValues(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        return StringUtils.EMPTY_STRING_ARRAY;
+    }
+
+    /**
+     * The values as string array for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @return The string values if it is present
+     */
+    default @Nonnull String[] stringValues(@Nonnull Class<? extends Annotation> annotation) {
+        return stringValues(annotation, VALUE_MEMBER);
+    }
+
+    /**
+     * The value as an optional string for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @return The string value if it is present
+     */
+    default @Nonnull Optional<String> stringValue(@Nonnull Class<? extends Annotation> annotation) {
+        ArgumentUtils.requireNonNull("annotation", annotation);
+        return stringValue(annotation, VALUE_MEMBER);
+    }
+
+    /**
+     * The value as an optional string for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @return The string value if it is present
+     */
+    default @Nonnull Optional<String> stringValue(@Nonnull String annotation) {
+        return stringValue(annotation, VALUE_MEMBER);
+    }
+
     /**
      * The value as an {@link OptionalDouble} for the given annotation and member.
      *
@@ -626,6 +722,29 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
         return result.map(OptionalDouble::of).orElseGet(OptionalDouble::empty);
     }
 
+    /**
+     * The value as an {@link OptionalDouble} for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @param member     The member
+     * @return THe {@link OptionalDouble} value
+     */
+    default @Nonnull OptionalDouble doubleValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        ArgumentUtils.requireNonNull("annotation", annotation);
+        return doubleValue(annotation.getName(), member);
+    }
+
+    /**
+     * The value as an {@link OptionalDouble} for the given annotation and member.
+     *
+     * @param annotation The annotation
+     * @return THe {@link OptionalDouble} value
+     */
+    default @Nonnull OptionalDouble doubleValue(@Nonnull Class<? extends Annotation> annotation) {
+        ArgumentUtils.requireNonNull("annotation", annotation);
+        return doubleValue(annotation, VALUE_MEMBER);
+    }
+
     /**
      * Get the value of default "value" the given annotation.
      *
@@ -709,7 +828,7 @@ default boolean isPresent(@Nonnull String annotation, @Nonnull String member) {
     }
 
     /**
-     * Returns whether the value of the given member is <em>true</em>.
+     * Returns whether the value of the given member is present.
      *
      * @param annotation The annotation class
      * @param member     The annotation member

core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataDelegate.java

@@ -31,6 +31,65 @@
  * @since 1.0
  */
 public interface AnnotationMetadataDelegate extends AnnotationMetadataProvider, AnnotationMetadata {
+    @Nonnull
+    @Override
+    default String[] stringValues(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        return getAnnotationMetadata().stringValues(annotation, member);
+    }
+
+    @Nonnull
+    @Override
+    default String[] stringValues(@Nonnull Class<? extends Annotation> annotation) {
+        return getAnnotationMetadata().stringValues(annotation, AnnotationMetadata.VALUE_MEMBER);
+    }
+
+    @Nonnull
+    @Override
+    default OptionalInt intValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        return getAnnotationMetadata().intValue(annotation, member);
+    }
+
+    @Nonnull
+    @Override
+    default OptionalInt intValue(@Nonnull Class<? extends Annotation> annotation) {
+        return getAnnotationMetadata().intValue(annotation);
+    }
+
+    @Nonnull
+    @Override
+    default Optional<String> stringValue(@Nonnull String annotation, @Nonnull String member) {
+        return getAnnotationMetadata().stringValue(annotation, member);
+    }
+
+    @Nonnull
+    @Override
+    default Optional<String> stringValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        return getAnnotationMetadata().stringValue(annotation, member);
+    }
+
+    @Nonnull
+    @Override
+    default Optional<String> stringValue(@Nonnull Class<? extends Annotation> annotation) {
+        return getAnnotationMetadata().stringValue(annotation);
+    }
+
+    @Nonnull
+    @Override
+    default Optional<String> stringValue(@Nonnull String annotation) {
+        return getAnnotationMetadata().stringValue(annotation);
+    }
+
+    @Nonnull
+    @Override
+    default OptionalDouble doubleValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+        return getAnnotationMetadata().doubleValue(annotation, member);
+    }
+
+    @Nonnull
+    @Override
+    default OptionalDouble doubleValue(@Nonnull Class<? extends Annotation> annotation) {
+        return getAnnotationMetadata().doubleValue(annotation);
+    }
 
     @Override
     default @Nonnull <T> Optional<T> getValue(@Nonnull String annotation, @Nonnull Argument<T> requiredType) {
@@ -191,22 +250,22 @@ default boolean isDeclaredAnnotationPresent(@Nonnull Class<? extends Annotation>
     }
 
     @Override
-    default @Nonnull Optional<Class> classValue(@Nonnull String annotation) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull String annotation) {
         return getAnnotationMetadata().classValue(annotation);
     }
 
     @Override
-    default @Nonnull Optional<Class> classValue(@Nonnull String annotation, @Nonnull String member) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull String annotation, @Nonnull String member) {
         return getAnnotationMetadata().classValue(annotation, member);
     }
 
     @Override
-    default @Nonnull Optional<Class> classValue(@Nonnull Class<? extends Annotation> annotation) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull Class<? extends Annotation> annotation) {
         return getAnnotationMetadata().classValue(annotation);
     }
 
     @Override
-    default @Nonnull Optional<Class> classValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
+    default @Nonnull Optional<Class<?>> classValue(@Nonnull Class<? extends Annotation> annotation, @Nonnull String member) {
         return getAnnotationMetadata().classValue(annotation, member);
     }