From 094cb14e36592d0c578149fbdeaedd871b742ea2 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 10 Jan 2019 09:45:49 -0700 Subject: [PATCH] [SHIBUI-1030] Replaced @Value with @Setter based on feedback from Dima. --- .../ui/configuration/EmailConfiguration.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java index 0c6e76aa9..cb3525f08 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java @@ -2,8 +2,9 @@ import edu.internet2.tier.shibboleth.admin.ui.service.EmailService; import edu.internet2.tier.shibboleth.admin.ui.service.EmailServiceImpl; +import lombok.Setter; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -21,15 +22,20 @@ * @author Bill Smith (wsmith@unicon.net) */ @Configuration +@ConfigurationProperties("shibui") public class EmailConfiguration { private static final String EMAIL_TEMPLATE_ENCODING = "UTF-8"; - @Value("${shibui.text.email.template.path.prefix:/mail/text/}") - private String textEmailTemplatePathPrefix; + //Configured via @ConfigurationProperties (using setter method) with 'shibui.text.email.template.path.prefix' property and + // default value set here if that property is not explicitly set in application.properties + @Setter + private String textEmailTemplatePathPrefix = "/mail/text/"; - @Value("${shibui.html.email.template.path.prefix:/mail/html/}") - private String htmlEmailTemplatePathPrefix; + //Configured via @ConfigurationProperties (using setter method) with 'shibui.html.email.template.path.prefix' property and + // default value set here if that property is not explicitly set in application.properties + @Setter + private String htmlEmailTemplatePathPrefix = "/mail/html/"; @Autowired private ApplicationContext applicationContext;