From cc7534e24daeae614f3f59fe154e2204324bf7cd Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Tue, 9 Jul 2019 14:01:58 +0300
Subject: [PATCH] Refactors MailService's method to be more generic.

---
 .../eudat/logic/services/utilities/InvitationServiceImpl.java | 2 +-
 .../java/eu/eudat/logic/services/utilities/MailService.java   | 2 +-
 .../eu/eudat/logic/services/utilities/MailServiceImpl.java    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java
index 6668fb3cd..4f28028b4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java
@@ -70,7 +70,7 @@ public class InvitationServiceImpl implements InvitationService {
         return CompletableFuture.runAsync(() -> {
             SimpleMail mail = new SimpleMail();
             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());
             try {
                 mailService.sendSimpleMail(mail);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailService.java
index 84ec2d3ec..d210f8422 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailService.java
@@ -8,7 +8,7 @@ import javax.mail.MessagingException;
 public interface MailService {
     void sendSimpleMail(SimpleMail mail) throws MessagingException;
 
-    String getMailTemplateContent();
+    String getMailTemplateContent(String resourceTemplate);
 
     String getMailTemplateSubject();
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailServiceImpl.java
index 6fa552ad8..fb1983949 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailServiceImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/MailServiceImpl.java
@@ -46,8 +46,8 @@ public class MailServiceImpl implements MailService {
     }
 
     @Override
-    public String getMailTemplateContent()  {
-        Resource resource = applicationContext.getResource("classpath:email.html");
+    public String getMailTemplateContent(String resourceTemplate)  {
+        Resource resource = applicationContext.getResource(resourceTemplate);
         try {
             InputStream inputStream = resource.getInputStream();
             StringWriter writer = new StringWriter();