diff --git a/CHANGELOG.md b/CHANGELOG.md index e11a9f1..dc1c468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.1.3 - 2018-11-20 + +* REFACTOR - `MailService.getText(..)` - Changed modifier from `private` to `public`. + ## 0.1.2 - 2018-08-15 * FEATURE - Added `Method` value in exception email report. diff --git a/README.md b/README.md index b14c2bc..6b84ef6 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This will be the last email service I will ever write in my whole lifetime. com.github.choonchernlim spring-boot-mail - 0.1.2 + 0.1.3 ``` diff --git a/pom.xml b/pom.xml index 67c4e43..54ea1a9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ com.github.choonchernlim spring-boot-ci - 0.3.1 + 0.3.2 com.github.choonchernlim spring-boot-mail - 0.1.2 + 0.1.3 diff --git a/src/main/groovy/com/github/choonchernlim/springbootmail/core/MailService.groovy b/src/main/groovy/com/github/choonchernlim/springbootmail/core/MailService.groovy index 386c6c6..8524dd6 100644 --- a/src/main/groovy/com/github/choonchernlim/springbootmail/core/MailService.groovy +++ b/src/main/groovy/com/github/choonchernlim/springbootmail/core/MailService.groovy @@ -141,7 +141,10 @@ class MailService { * @param isHtmlText Whether it is HTML or plain text * @return Email message */ - private String getText(Exception exception, HttpServletRequest request, String userText, boolean isHtmlText) { + String getText(final Exception exception, + final HttpServletRequest request, + final String userText, + final boolean isHtmlText) { if (!exception) { return userText } @@ -151,7 +154,10 @@ class MailService { final Map requestMap = request ? dataExtractorService.getRequestMap(request) : [:] final Map dataMap = (generalInfoMap + requestMap + exceptionMap).asImmutable() + final String generatedText = textOutputService.getText(dataMap, isHtmlText) - return userText + '\n\n' + textOutputService.getText(dataMap, isHtmlText) + return userText?.trim() ? + userText + '\n\n' + generatedText : + generatedText } }