MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Refactors MailService's method to be more generic.

This commit is contained in:
gkolokythas 2019-07-09 14:01:58 +03:00
parent ba97740f8b
commit cc7534e24d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java
View File

@ -70,7 +70,7 @@ public class InvitationServiceImpl implements InvitationService {
return CompletableFuture.runAsync(() -> { return CompletableFuture.runAsync(() -> {
SimpleMail mail = new SimpleMail(); SimpleMail mail = new SimpleMail();
mail.setSubject(createSubject(dmp, mailService.getMailTemplateSubject())); mail.setSubject(createSubject(dmp, mailService.getMailTemplateSubject()));
mail.setContent(createContent(invitation.getId(), dmp, recipient, mailService.getMailTemplateContent())); mail.setContent(createContent(invitation.getId(), dmp, recipient, mailService.getMailTemplateContent("classpath:email.html")));
mail.setTo(invitation.getInvitationEmail()); mail.setTo(invitation.getInvitationEmail());
try { try {
mailService.sendSimpleMail(mail); mailService.sendSimpleMail(mail);

2
dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailService.java
View File

@ -8,7 +8,7 @@ import javax.mail.MessagingException;
public interface MailService { public interface MailService {
void sendSimpleMail(SimpleMail mail) throws MessagingException; void sendSimpleMail(SimpleMail mail) throws MessagingException;
String getMailTemplateContent(); String getMailTemplateContent(String resourceTemplate);
String getMailTemplateSubject(); String getMailTemplateSubject();
} }

4
dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailServiceImpl.java
View File

@ -46,8 +46,8 @@ public class MailServiceImpl implements MailService {
} }
@Override @Override
public String getMailTemplateContent() { public String getMailTemplateContent(String resourceTemplate) {
Resource resource = applicationContext.getResource("classpath:email.html"); Resource resource = applicationContext.getResource(resourceTemplate);
try { try {
InputStream inputStream = resource.getInputStream(); InputStream inputStream = resource.getInputStream();
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();