Merge pull request #2 from choonchernlim/feature/0.1.3

0.1.3
choonchernlim · Nov 20, 2018 · f0f87dd · f0f87dd
2 parents 95c6c78 + 8ad5ce6
commit f0f87dd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -13,7 +13,7 @@ This will be the last email service I will ever write in my whole lifetime.
 <dependency>
     <groupId>com.github.choonchernlim</groupId>
     <artifactId>spring-boot-mail</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>com.github.choonchernlim</groupId>
         <artifactId>spring-boot-ci</artifactId>
-        <version>0.3.1</version>
+        <version>0.3.2</version>
         <relativePath/>
     </parent>
 
     <groupId>com.github.choonchernlim</groupId>
     <artifactId>spring-boot-mail</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</version>
 
     <dependencyManagement>
         <dependencies>

diff --git 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<String, Object> requestMap = request ? dataExtractorService.getRequestMap(request) : [:]
 
         final Map<String, Object> 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
     }
 }