Merge pull request #34281 from gsmet/mailtemplate-location

cescoffier · web-flow · commit 3a6035718f59 · 2023-06-25T14:49:27.000+02:00
Also create the default mailer if @location is used
diff --git a/extensions/mailer/deployment/src/main/java/io/quarkus/mailer/deployment/MailerProcessor.java b/extensions/mailer/deployment/src/main/java/io/quarkus/mailer/deployment/MailerProcessor.java
@@ -100,7 +100,10 @@ MailersBuildItem generateMailerSupportBean(MailerRecorder recorder,
                 .filter(i -> SUPPORTED_INJECTION_TYPES.contains(i.getRequiredType().name()))
                 .collect(Collectors.toList());
 
-        boolean hasDefaultMailer = mailerInjectionPoints.stream().anyMatch(i -> i.hasDefaultedQualifier())
+        boolean hasDefaultMailer = mailerInjectionPoints.stream()
+                .anyMatch(i -> i.hasDefaultedQualifier() ||
+                // we inject a MailTemplate and it is not named
+                        (MAIL_TEMPLATE.equals(i.getType().name()) && i.getRequiredQualifier(MAILER_NAME) == null))
                 || !index.getIndex().getAnnotations(CheckedTemplate.class).isEmpty();
 
         Set<String> namedMailers = mailerInjectionPoints.stream()
diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateLocationTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateLocationTest.java
@@ -0,0 +1,45 @@
+package io.quarkus.mailer;
+
+import java.time.Duration;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Location;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Uni;
+
+public class MailTemplateLocationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(MailTemplates.class)
+                    .addAsResource("mock-config.properties", "application.properties")
+                    .addAsResource(new StringAsset(""
+                            + "<html>{name}</html>"), "templates/confirmation.html"));
+
+    @Inject
+    MailTemplates mailTemplates;
+
+    @Test
+    public void testValidationFailed() {
+        mailTemplates.send().await().atMost(Duration.ofSeconds(5));
+    }
+
+    @Singleton
+    static class MailTemplates {
+
+        @Inject
+        @Location("confirmation")
+        MailTemplate confirmationMailTemplate;
+
+        Uni<Void> send() {
+            return confirmationMailTemplate.to("quarkus@quarkus.io").subject("Test").data("name", "Foo").send();
+        }
+    }
+}
