Vincent Gasbarro 8 年之前
父節點
當前提交
25d00d22e3

+ 1
- 0
src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java 查看文件

@@ -14,6 +14,7 @@ import javax.inject.Inject;
14 14
 import javax.validation.Valid;
15 15
 import java.net.URI;
16 16
 
17
+
17 18
 @RestController
18 19
 public class PollController {
19 20
 

+ 13
- 0
src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ErrorDetail.java 查看文件

@@ -1,5 +1,9 @@
1 1
 package io.zipcoder.tc_spring_poll_application.dtos.error;
2 2
 
3
+import java.util.HashMap;
4
+import java.util.List;
5
+import java.util.Map;
6
+
3 7
 public class ErrorDetail {
4 8
 
5 9
     private String title;
@@ -7,6 +11,7 @@ public class ErrorDetail {
7 11
     private String detail;
8 12
     private long timeStamp;
9 13
     private String developerMessage;
14
+    private Map<String, List<ValidationError>> errors = new HashMap<String, List<ValidationError>>();
10 15
 
11 16
 
12 17
 
@@ -49,4 +54,12 @@ public class ErrorDetail {
49 54
     public void setDeveloperMessage(String developerMessage) {
50 55
         this.developerMessage = developerMessage;
51 56
     }
57
+
58
+    public Map<String, List<ValidationError>> getErrors() {
59
+        return errors;
60
+    }
61
+
62
+    public void setErrors(Map<String, List<ValidationError>> errors) {
63
+        this.errors = errors;
64
+    }
52 65
 }

+ 25
- 0
src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ValidationError.java 查看文件

@@ -0,0 +1,25 @@
1
+package io.zipcoder.tc_spring_poll_application.dtos.error;
2
+
3
+public class ValidationError {
4
+
5
+    private String code;
6
+    private String message;
7
+
8
+
9
+    public String getCode() {
10
+        return code;
11
+    }
12
+
13
+    public void setCode(String code) {
14
+        this.code = code;
15
+    }
16
+
17
+    public String getMessage() {
18
+        return message;
19
+    }
20
+
21
+    public void setMessage(String message) {
22
+        this.message = message;
23
+    }
24
+
25
+}

+ 40
- 0
src/main/java/io/zipcoder/tc_spring_poll_application/handler/RestExceptionHandler.java 查看文件

@@ -1,18 +1,28 @@
1 1
 package io.zipcoder.tc_spring_poll_application.handler;
2 2
 
3 3
 import io.zipcoder.tc_spring_poll_application.dtos.error.ErrorDetail;
4
+import io.zipcoder.tc_spring_poll_application.dtos.error.ValidationError;
4 5
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
6
+import org.springframework.beans.factory.annotation.Autowired;
7
+import org.springframework.context.MessageSource;
5 8
 import org.springframework.http.HttpStatus;
6 9
 import org.springframework.http.ResponseEntity;
10
+import org.springframework.validation.FieldError;
11
+import org.springframework.web.bind.MethodArgumentNotValidException;
7 12
 import org.springframework.web.bind.annotation.ControllerAdvice;
8 13
 import org.springframework.web.bind.annotation.ExceptionHandler;
9 14
 
10 15
 import javax.servlet.http.HttpServletRequest;
16
+import java.util.ArrayList;
11 17
 import java.util.Date;
18
+import java.util.List;
12 19
 
13 20
 @ControllerAdvice
14 21
 public class RestExceptionHandler {
15 22
 
23
+    @Autowired
24
+    private MessageSource messageSource;
25
+
16 26
     @ExceptionHandler(ResourceNotFoundException.class)
17 27
     public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
18 28
 
@@ -26,4 +36,34 @@ public class RestExceptionHandler {
26 36
         return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND);
27 37
     }
28 38
 
39
+    @ExceptionHandler(MethodArgumentNotValidException.class)
40
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
41
+        ErrorDetail errorDetail = new ErrorDetail();
42
+
43
+        errorDetail.setTimeStamp(new Date().getTime());
44
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
45
+        String requestPath = (String) request.getAttribute("javax.servlet.error.request_uri");
46
+        if (requestPath == null) {
47
+            requestPath = request.getRequestURI();
48
+        }
49
+        errorDetail.setTitle("Validation Failed");
50
+        errorDetail.setDetail("Input validation failed");
51
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
52
+
53
+        List<FieldError> fieldErrors = manve.getBindingResult().getFieldErrors();
54
+        for (FieldError fe : fieldErrors) {
55
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
56
+            if (validationErrorList == null) {
57
+                validationErrorList = new ArrayList<ValidationError>();
58
+                errorDetail.getErrors().put(fe.getField(), validationErrorList);
59
+            }
60
+            ValidationError validationError = new ValidationError();
61
+            validationError.setCode(fe.getCode());
62
+            validationError.setMessage(fe.getDefaultMessage());
63
+            validationError.setMessage(messageSource.getMessage(fe, null));
64
+            validationErrorList.add(validationError);
65
+        }
66
+        return new ResponseEntity<>(errorDetail, null, HttpStatus.BAD_REQUEST);
67
+    }
68
+
29 69
 }

+ 74
- 0
src/main/resources/import.sql 查看文件

@@ -0,0 +1,74 @@
1
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
2
+insert into option (option_id, option_value, poll_id) values (1, 'Red', 1);
3
+insert into option (option_id, option_value, poll_id) values (2, 'Orange', 1);
4
+insert into option (option_id, option_value, poll_id) values (3, 'Yellow', 1);
5
+
6
+insert into poll (poll_id, question) values (2, 'What is your favorite movie?');
7
+insert into option (option_id, option_value, poll_id) values (4, 'Pulp Fiction', 2);
8
+insert into option (option_id, option_value, poll_id) values (5, 'In Bruges', 2);
9
+insert into option (option_id, option_value, poll_id) values (6, 'Rounders', 2);
10
+
11
+insert into poll (poll_id, question) values (3, 'What is your favorite book?');
12
+insert into option (option_id, option_value, poll_id) values (7, 'Game of Thrones', 3);
13
+insert into option (option_id, option_value, poll_id) values (8, 'The Kingkiller Chronicles', 3);
14
+insert into option (option_id, option_value, poll_id) values (9, 'The Dictionary', 3);
15
+
16
+insert into poll (poll_id, question) values (4, 'What is your favorite TV show?');
17
+insert into option (option_id, option_value, poll_id) values (10, 'Atlanta', 4);
18
+insert into option (option_id, option_value, poll_id) values (11, 'Billions', 4);
19
+insert into option (option_id, option_value, poll_id) values (12, 'Survivor', 4);
20
+
21
+insert into poll (poll_id, question) values (5, 'What is the best lunch spot?');
22
+insert into option (option_id, option_value, poll_id) values (13, 'Mimis', 5);
23
+insert into option (option_id, option_value, poll_id) values (14, 'Bennis', 5);
24
+insert into option (option_id, option_value, poll_id) values (15, 'Qdoba', 5);
25
+
26
+insert into poll (poll_id, question) values (6, 'What is your favorite sport?');
27
+insert into option (option_id, option_value, poll_id) values (16, 'Basketball', 6);
28
+insert into option (option_id, option_value, poll_id) values (17, 'Football', 6);
29
+insert into option (option_id, option_value, poll_id) values (18, 'Boogie Boarding', 6);
30
+
31
+insert into poll (poll_id, question) values (7, 'Where should Joe sleep?');
32
+insert into option (option_id, option_value, poll_id) values (19, 'Sisters home', 7);
33
+insert into option (option_id, option_value, poll_id) values (20, 'Original home', 7);
34
+insert into option (option_id, option_value, poll_id) values (21, 'Zip Code couch', 7);
35
+
36
+insert into poll (poll_id, question) values (8, 'When should you get coffee?');
37
+insert into option (option_id, option_value, poll_id) values (22, 'Past', 8);
38
+insert into option (option_id, option_value, poll_id) values (23, 'Present', 8);
39
+insert into option (option_id, option_value, poll_id) values (24, 'Future', 8);
40
+
41
+insert into poll (poll_id, question) values (9, 'How many polls are left to create?');
42
+insert into option (option_id, option_value, poll_id) values (25, 'One', 9);
43
+insert into option (option_id, option_value, poll_id) values (26, 'More', 9);
44
+insert into option (option_id, option_value, poll_id) values (27, 'So many', 9);
45
+
46
+insert into poll (poll_id, question) values (10, 'Who is a former child actor?');
47
+insert into option (option_id, option_value, poll_id) values (28, 'Kay', 10);
48
+insert into option (option_id, option_value, poll_id) values (29, 'Lawrence', 10);
49
+insert into option (option_id, option_value, poll_id) values (30, 'Joe', 10);
50
+
51
+insert into poll (poll_id, question) values (11, 'Which company would you like to work for?');
52
+insert into option (option_id, option_value, poll_id) values (31, 'McDonalds', 11);
53
+insert into option (option_id, option_value, poll_id) values (32, 'Burger King', 11);
54
+insert into option (option_id, option_value, poll_id) values (33, 'Taco Bell', 11);
55
+
56
+insert into poll (poll_id, question) values (12, 'Why?');
57
+insert into option (option_id, option_value, poll_id) values (34, 'Because', 12);
58
+insert into option (option_id, option_value, poll_id) values (35, 'Idk', 12);
59
+insert into option (option_id, option_value, poll_id) values (36, 'Why not?', 12);
60
+
61
+insert into poll (poll_id, question) values (13, 'Do you enjoy polls?');
62
+insert into option (option_id, option_value, poll_id) values (37, 'Yes', 13);
63
+insert into option (option_id, option_value, poll_id) values (38, 'No', 13);
64
+insert into option (option_id, option_value, poll_id) values (39, 'Maybe', 13);
65
+
66
+insert into poll (poll_id, question) values (14, 'Chicken on a...?');
67
+insert into option (option_id, option_value, poll_id) values (40, 'Biscuit', 14);
68
+insert into option (option_id, option_value, poll_id) values (41, 'Buttermilk pancake', 14);
69
+insert into option (option_id, option_value, poll_id) values (42, 'Cheerio', 14);
70
+
71
+insert into poll (poll_id, question) values (15, 'How do you like your eggs?');
72
+insert into option (option_id, option_value, poll_id) values (43, 'Shaken', 15);
73
+insert into option (option_id, option_value, poll_id) values (44, 'Stirred', 15);
74
+insert into option (option_id, option_value, poll_id) values (45, 'Scrambled', 15);

+ 2
- 0
src/main/resources/messages.properties 查看文件

@@ -0,0 +1,2 @@
1
+NotEmpty.poll.question=Question is a required field
2
+Size.poll.options=Options must be greater than {2} and less than {1}