Fix getting type arguments from the immutable conversion context

micronaut-projects · Jan 18, 2022 · 2eb43c6 · 2eb43c6
1 parent 60fc0f8
commit 2eb43c6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/core/src/main/java/io/micronaut/core/convert/ArgumentConversionContext.java b/core/src/main/java/io/micronaut/core/convert/ArgumentConversionContext.java
@@ -19,6 +19,8 @@
 import io.micronaut.core.annotation.AnnotationMetadataProvider;
 import io.micronaut.core.type.Argument;
 
+import java.util.Map;
+
 /**
  * Extended version of the {@link ConversionContext} specifically for conversion {@link Argument} instances.
  *
@@ -33,6 +35,16 @@ public interface ArgumentConversionContext<T> extends ConversionContext, Annotat
      */
     Argument<T> getArgument();
 
+    @Override
+    default Argument[] getTypeParameters() {
+        return getArgument().getTypeParameters();
+    }
+
+    @Override
+    default Map<String, Argument<?>> getTypeVariables() {
+        return getArgument().getTypeVariables();
+    }
+
     @Override
     default AnnotationMetadata getAnnotationMetadata() {
         return getArgument().getAnnotationMetadata();

diff --git a/core/src/main/java/io/micronaut/core/convert/DefaultArgumentConversionContext.java b/core/src/main/java/io/micronaut/core/convert/DefaultArgumentConversionContext.java
@@ -47,16 +47,6 @@ class DefaultArgumentConversionContext<T> implements ArgumentConversionContext<T
         this.finalCharset = finalCharset;
     }
 
-    @Override
-    public Argument[] getTypeParameters() {
-        return argument.getTypeParameters();
-    }
-
-    @Override
-    public Map<String, Argument<?>> getTypeVariables() {
-        return argument.getTypeVariables();
-    }
-
     @Override
     public Locale getLocale() {
         return finalLocale;

diff --git a/core/src/main/java/io/micronaut/core/convert/ImmutableArgumentConversionContext.java b/core/src/main/java/io/micronaut/core/convert/ImmutableArgumentConversionContext.java
@@ -18,6 +18,8 @@
 import io.micronaut.core.type.Argument;
 import io.micronaut.core.util.ArgumentUtils;
 
+import java.util.Map;
+
 /**
  * Immutable variant of {@link io.micronaut.core.convert.ArgumentConversionContext} that can be used as a constant
  * in cases where conversion error handling and rejection is not required.
@@ -27,6 +29,7 @@
  * @author graemerocher
  */
 public interface ImmutableArgumentConversionContext<T> extends ArgumentConversionContext<T> {
+
     /**
      * Create a new simple {@link ConversionContext} for the given generic type variables.
      *