Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Also create the default mailer if @Location is used #34281

Merged
merged 1 commit into from
Jun 25, 2023
Merged

Also create the default mailer if @Location is used #34281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion extensions/mailer/deployment/src/main/java/io/quarkus/mailer/deployment/MailerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
45 changes: 45 additions & 0 deletions extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateLocationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
}
}