don't use self reference

jhipster · Dec 1, 2023 · 8dafda5 · 8dafda5
1 parent a6d2440
commit 8dafda5
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs b/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs
@@ -29,9 +29,7 @@ import jakarta.mail.internet.MimeMessage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.mail.MailException;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -62,10 +60,6 @@ public class MailService {
 
     private final SpringTemplateEngine templateEngine;
 
-    @Autowired
-    @Lazy
-    private MailService self;
-
     public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender,
             MessageSource messageSource, SpringTemplateEngine templateEngine) {
 
@@ -77,6 +71,10 @@ public class MailService {
 
     @Async
     public void sendEmail(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
+        this.internalSendEmail(to, subject, content, isMultipart, isHtml);
+    }
+
+    private void internalSendEmail(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
         log.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}",
             isMultipart, isHtml, to, subject, content);
 
@@ -97,6 +95,10 @@ public class MailService {
 
     @Async
     public void sendEmailFromTemplate(<%= user.persistClass %> user, String templateName, String titleKey) {
+        this.internalSendEmailFromTemplate(user, templateName, titleKey);
+    }
+
+    private void internalSendEmailFromTemplate(<%= user.persistClass %> user, String templateName, String titleKey) {
         if (user.getEmail() == null) {
             log.debug("Email doesn't exist for user '{}'", user.getLogin());
             return;
@@ -107,26 +109,26 @@ public class MailService {
         context.setVariable(BASE_URL, jHipsterProperties.getMail().getBaseUrl());
         String content = templateEngine.process(templateName, context);
         String subject = messageSource.getMessage(titleKey, null, locale);
-        self.sendEmail(user.getEmail(), subject, content, false, true);
+        this.internalSendEmail(user.getEmail(), subject, content, false, true);
     }
 <%_ if (!authenticationTypeOauth2) { _%>
 
     @Async
     public void sendActivationEmail(<%= user.persistClass %> user) {
         log.debug("Sending activation email to '{}'", user.getEmail());
-        self.sendEmailFromTemplate(user, "mail/activationEmail", "email.activation.title");
+        this.internalSendEmailFromTemplate(user, "mail/activationEmail", "email.activation.title");
     }
 
     @Async
     public void sendCreationEmail(<%= user.persistClass %> user) {
         log.debug("Sending creation email to '{}'", user.getEmail());
-        self.sendEmailFromTemplate(user, "mail/creationEmail", "email.activation.title");
+        this.internalSendEmailFromTemplate(user, "mail/creationEmail", "email.activation.title");
     }
 
     @Async
     public void sendPasswordResetMail(<%= user.persistClass %> user) {
         log.debug("Sending password reset email to '{}'", user.getEmail());
-        self.sendEmailFromTemplate(user, "mail/passwordResetEmail", "email.reset.title");
+        this.internalSendEmailFromTemplate(user, "mail/passwordResetEmail", "email.reset.title");
     }
 <%_ } _%>
 }