From 88273824fc0cbce08945de9e9f30ea202a5a039b Mon Sep 17 00:00:00 2001
From: Joachim Grimm <grimm.jo@web.de>
Date: Wed, 8 Mar 2023 11:38:46 +0100
Subject: [PATCH 1/2] correctly resolve header name from argument name

if the name in the annotation is empty, use the argument name as header key
---
 .../io/micronaut/nats/intercept/AbstractIntroductionAdvice.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java b/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java
index 3b6b3d9f..c0a76e0f 100644
--- a/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java
+++ b/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java
@@ -251,6 +251,7 @@ private Map.Entry<String, List<String>> getNameAndValue(Argument<?> argument,
                                                             Map<String, Object> parameterValues) {
         String argumentName = argument.getName();
         String name = annotationValue.get("name", String.class)
+            .filter(StringUtils::isNotEmpty)
             .orElse(annotationValue.stringValue().orElse(argumentName));
         Optional<List> value =
             conversionService.convert(parameterValues.get(argumentName),

From 09bea64c55da5228db54915b078ecc8c185496c9 Mon Sep 17 00:00:00 2001
From: Joachim Grimm <grimm.jo@web.de>
Date: Wed, 8 Mar 2023 18:32:42 +0100
Subject: [PATCH 2/2] use stringValue instead of filtering optionals

---
 .../micronaut/nats/intercept/AbstractIntroductionAdvice.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java b/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java
index c0a76e0f..466d3d0d 100644
--- a/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java
+++ b/nats/src/main/java/io/micronaut/nats/intercept/AbstractIntroductionAdvice.java
@@ -250,8 +250,7 @@ private Map.Entry<String, List<String>> getNameAndValue(Argument<?> argument,
                                                             AnnotationValue<?> annotationValue,
                                                             Map<String, Object> parameterValues) {
         String argumentName = argument.getName();
-        String name = annotationValue.get("name", String.class)
-            .filter(StringUtils::isNotEmpty)
+        String name = annotationValue.stringValue("name")
             .orElse(annotationValue.stringValue().orElse(argumentName));
         Optional<List> value =
             conversionService.convert(parameterValues.get(argumentName),