Correct retrieving deserializer / serializer from the bean context

serde-support/src/main/java/io/micronaut/serde/support/LegacyBeansFactory.java

@@ -25,11 +25,14 @@
 import io.micronaut.core.type.Argument;
 import io.micronaut.inject.ArgumentInjectionPoint;
 import io.micronaut.inject.InjectionPoint;
+import io.micronaut.serde.Deserializer;
 import io.micronaut.serde.Serde;
 import io.micronaut.serde.SerdeIntrospections;
+import io.micronaut.serde.Serializer;
 import io.micronaut.serde.config.DeserializationConfiguration;
 import io.micronaut.serde.config.SerdeConfiguration;
 import io.micronaut.serde.config.SerializationConfiguration;
+import io.micronaut.serde.exceptions.SerdeException;
 import io.micronaut.serde.support.deserializers.ObjectDeserializer;
 import io.micronaut.serde.support.deserializers.SerdeDeserializationPreInstantiateCallback;
 import io.micronaut.serde.support.serdes.InetAddressSerde;
@@ -69,6 +72,32 @@ <S extends Serde<T>, T> S provideSerde(InjectionPoint<Serde<T>> serdeInjectionPo
         return null;
     }
 
+    @Any
+    @Prototype
+    @BootstrapContextCompatible
+    <S extends Deserializer<T>, T> S provideDeserializer(InjectionPoint<Deserializer<T>> injectionPoint,
+                                                         BeanProvider<DefaultSerdeRegistry> serdeRegistry) throws SerdeException {
+        if (injectionPoint instanceof ArgumentInjectionPoint<?, ?> argumentInjectionPoint) {
+            Argument typeParameter = argumentInjectionPoint.getArgument().getTypeParameters()[0];
+            DefaultSerdeRegistry defaultSerdeRegistry = serdeRegistry.get();
+            return (S) defaultSerdeRegistry.findDeserializer(typeParameter);
+        }
+        return null;
+    }
+
+    @Any
+    @Prototype
+    @BootstrapContextCompatible
+    <S extends Serializer<T>, T> S provideSerializer(InjectionPoint<Serializer<T>> injectionPoint,
+                                                     BeanProvider<DefaultSerdeRegistry> serdeRegistry) throws SerdeException {
+        if (injectionPoint instanceof ArgumentInjectionPoint<?, ?> argumentInjectionPoint) {
+            Argument typeParameter = argumentInjectionPoint.getArgument().getTypeParameters()[0];
+            DefaultSerdeRegistry defaultSerdeRegistry = serdeRegistry.get();
+            return (S) defaultSerdeRegistry.findSerializer(typeParameter);
+        }
+        return null;
+    }
+
     @Singleton
     @BootstrapContextCompatible
     ObjectSerializer provideObjectSerializer(BeanContext beanContext,

serde-support/src/test/groovy/io/micronaut/serde/support/serdes/BeanContextSerdeSpec.groovy

@@ -2,7 +2,9 @@ package io.micronaut.serde.support.serdes
 
 import io.micronaut.context.BeanContext
 import io.micronaut.core.type.Argument
+import io.micronaut.serde.Deserializer
 import io.micronaut.serde.Serde
+import io.micronaut.serde.Serializer
 import io.micronaut.serde.support.deserializers.ObjectDeserializer
 import io.micronaut.serde.support.serializers.ObjectSerializer
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -71,5 +73,21 @@ class BeanContextSerdeSpec extends Specification {
         enumSerde.getClass() == EnumSerde
     }
 
+    void "test retrieving Map deserializer"() {
+        when:
+        def deserializer = beanContext.getBean(Argument.of(Deserializer, Argument.mapOf(String, Object)))
+
+        then:
+        deserializer
+    }
+
+    void "test retrieving Map serializer"() {
+        when:
+        def deserializer = beanContext.getBean(Argument.of(Serializer, Argument.mapOf(String, Object)))
+
+        then:
+        deserializer
+    }
+
     static enum MyEnum {}
 }