Merge pull request #1 from choonchernlim/feature/next

0.1.2
choonchernlim · Aug 15, 2018 · 95c6c78 · 95c6c78
2 parents edb6a96 + fa27845
commit 95c6c78
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.1.2 - 2018-08-15
+
+* FEATURE - Added `Method` value in exception email report.
+
 ## 0.1.1 - 2017-06-20
 
 * Added `equals()` and `hashcode()` to `MailBean` to make it easier to test.

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.1</version>
+    <version>0.1.2</version>
 </dependency>
 ```
 
@@ -115,4 +115,4 @@ mailService.send(MailBean.builder().
                      subject('subject').
                      text('text').
                      build())
-```
+```
diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,23 @@
     <parent>
         <groupId>com.github.choonchernlim</groupId>
         <artifactId>spring-boot-ci</artifactId>
-        <version>0.2.1</version>
+        <version>0.3.1</version>
+        <relativePath/>
     </parent>
 
     <groupId>com.github.choonchernlim</groupId>
     <artifactId>spring-boot-mail</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.spockframework</groupId>
+                <artifactId>spock-spring</artifactId>
+                <version>${spock.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <!-- Scope: Compile -->

diff --git a/src/main/groovy/com/github/choonchernlim/springbootmail/core/DataExtractorService.groovy b/src/main/groovy/com/github/choonchernlim/springbootmail/core/DataExtractorService.groovy
@@ -69,6 +69,7 @@ class DataExtractorService {
                 (FieldConstant.REQUEST_USER_ID)       : request.userPrincipal?.name,
                 (FieldConstant.REQUEST_USER_HOST_NAME): request.remoteHost,
                 (FieldConstant.REQUEST_REMOTE_ADDRESS): request.remoteAddr,
+                (FieldConstant.REQUEST_METHOD)        : request.method,
                 (FieldConstant.REQUEST_URL)           : request.requestURL.toString(),
                 (FieldConstant.REQUEST_PARAMETERS)    : getRequestParameterMap(request),
                 (FieldConstant.REQUEST_BODY)          : getRequestBody(request),

diff --git a/src/main/groovy/com/github/choonchernlim/springbootmail/core/FieldConstant.groovy b/src/main/groovy/com/github/choonchernlim/springbootmail/core/FieldConstant.groovy
@@ -12,6 +12,7 @@ final class FieldConstant {
     static final String REQUEST_USER_HOST_NAME = 'Request :: User :: Host Name'
     static final String REQUEST_REMOTE_ADDRESS = 'Request :: Remote Address'
 
+    static final String REQUEST_METHOD = 'Request :: Method'
     static final String REQUEST_URL = 'Request :: URL'
     static final String REQUEST_PARAMETERS = 'Request :: Parameters'
     static final String REQUEST_BODY = 'Request :: Body'

diff --git a/src/test/groovy/com/github/choonchernlim/springbootmail/core/DataExtractorServiceSpec.groovy b/src/test/groovy/com/github/choonchernlim/springbootmail/core/DataExtractorServiceSpec.groovy
@@ -57,6 +57,7 @@ class DataExtractorServiceSpec extends Specification {
                 remoteHost: 'remoteHost',
                 remoteAddr: 'remoteAddr',
                 requestURI: '/abc',
+                method: 'GET',
                 serverName: 'serverName',
                 serverPort: 1234,
                 parameters: ['param1': 'value1', 'param2': 'value2'],
@@ -74,6 +75,7 @@ class DataExtractorServiceSpec extends Specification {
                 (FieldConstant.REQUEST_USER_ID)       : 'name',
                 (FieldConstant.REQUEST_USER_HOST_NAME): 'remoteHost',
                 (FieldConstant.REQUEST_REMOTE_ADDRESS): 'remoteAddr',
+                (FieldConstant.REQUEST_METHOD)        : 'GET',
                 (FieldConstant.REQUEST_URL)           : 'http://serverName:1234/abc',
                 (FieldConstant.REQUEST_PARAMETERS)    : ['param1': 'value1', 'param2': 'value2'],
                 (FieldConstant.REQUEST_BODY)          : 'body',
@@ -94,6 +96,7 @@ class DataExtractorServiceSpec extends Specification {
                 (FieldConstant.REQUEST_USER_ID)       : null,
                 (FieldConstant.REQUEST_USER_HOST_NAME): 'localhost',
                 (FieldConstant.REQUEST_REMOTE_ADDRESS): '127.0.0.1',
+                (FieldConstant.REQUEST_METHOD)        : '',
                 (FieldConstant.REQUEST_URL)           : 'http://localhost',
                 (FieldConstant.REQUEST_PARAMETERS)    : [:],
                 (FieldConstant.REQUEST_BODY)          : null,

diff --git a/...t/groovy/com/github/choonchernlim/springbootmail/core/EmailCollectionValidatorSpec.groovy b/...t/groovy/com/github/choonchernlim/springbootmail/core/EmailCollectionValidatorSpec.groovy
@@ -7,7 +7,7 @@ import spock.lang.Unroll
 
 class EmailCollectionValidatorSpec extends Specification {
 
-    def context = new ConstraintValidatorContextImpl(null, null, PathImpl.createRootPath(), null)
+    def context = new ConstraintValidatorContextImpl(null, null, PathImpl.createRootPath(), null, null)
     def validator = new EmailCollectionValidator()
 
     @Unroll