This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 9b3a659c4da853997c981331ce85157baac07542 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Feb 18 17:46:59 2015 +0100 On désactive l'envoi de mail si pas de SMTP configuré, on supprime la notion de devMode (termine #6685) --- .../src/main/java/fr/ifremer/wao/WaoApplicationConfig.java | 5 ----- .../src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java | 5 ----- .../main/java/fr/ifremer/wao/services/service/mail/EmailService.java | 5 +++-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java b/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java index 2e3e8ca..c0d8677 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java @@ -70,11 +70,6 @@ public class WaoApplicationConfig { } } - public boolean isDevMode() { - boolean isDevMode = applicationConfig.getOptionAsBoolean(WaoApplicationConfigOption.DEV_MODE.key); - return isDevMode; - } - public Map<String, String> getTopiaProperties() { Map<String, String> jpaParameters = Maps.newHashMap(); Properties hibernateProperties = applicationConfig.getOptionStartsWith("hibernate"); diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java b/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java index a7d28b5..e924aa9 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java @@ -50,11 +50,6 @@ public enum WaoApplicationConfigOption implements ConfigOptionDef { "L'adresse d'expéditeur pour les mails de notifications", "", String.class), - DEV_MODE( - "wao.devMode", - "Mode développement, court-circuite l'envoi de mail", - "true", Boolean.class), - CACHING_ENABLED( "wao.cachingEnabled", "Active les caches métiers", diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java index 06915e4..ab613fb 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java @@ -28,6 +28,7 @@ import com.samskivert.mustache.Template; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.services.service.WaoServiceSupport; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.mail.Email; @@ -52,10 +53,10 @@ public class EmailService extends WaoServiceSupport { public void send(WaoMail mail) { - if (getApplicationConfig().isDevMode()) { + if (StringUtils.isBlank(getApplicationConfig().getSmtpFrom())) { if (log.isInfoEnabled()) { - log.info("an email should have been sent if not in devMode: from = " + mail.getFrom() + ", tos = " + + log.info("an email should have been sent if smtp host was provided: from = " + mail.getFrom() + ", tos = " + mail.getTos() + ", subject = '" + mail.getSubject() + "', body = \n" + getBody(mail)); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.