part 5.7 finished

src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java

@@ -9,6 +9,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
@@ -28,7 +29,7 @@ public class PollController {
     }
 
     @RequestMapping(value="/polls", method=RequestMethod.POST)
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+    public ResponseEntity<?> createPoll(@Valid @RequestBody Poll poll) {
         poll = pollRepository.save(poll);
 
         URI newPollUri = ServletUriComponentsBuilder
@@ -48,7 +49,7 @@ public class PollController {
     }
 
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
-    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+    public ResponseEntity<?> updatePoll(@Valid @RequestBody Poll poll, @PathVariable Long pollId) {
         verifyPoll(pollId);
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);

src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java

@@ -42,4 +42,4 @@ public class VoteController {
     public Iterable<Vote> getVote(@PathVariable Long pollId) {
         return voteRepository.findById(pollId);
     }
-}
+}

src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java

@@ -1,6 +1,9 @@
 package io.zipcoder.tc_spring_poll_application.domain;
 
+import org.hibernate.validator.constraints.NotEmpty;
+
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.util.Set;
 
 @Entity
@@ -12,11 +15,13 @@ public class Poll {
     private long id;
 
     @Column(name = "QUESTION")
+    @NotEmpty
     private String question;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
+    @Size(min=2, max = 6)
     private Set<Option> options;
 
     public long getId() {

src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java

@@ -1,5 +1,8 @@
 package io.zipcoder.tc_spring_poll_application.error;
 
+import java.util.List;
+import java.util.Map;
+
 public class ErrorDetail {
 
     private String title;
@@ -7,6 +10,7 @@ public class ErrorDetail {
     private String detail;
     private long timeStamp;
     private String developerMessage;
+    private Map<String, List<ValidationError>> errors;
 
     public ErrorDetail() {
     }
@@ -58,4 +62,12 @@ public class ErrorDetail {
     public void setDeveloperMessage(String developerMessage) {
         this.developerMessage = developerMessage;
     }
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
 }

src/main/java/io/zipcoder/tc_spring_poll_application/error/RestExceptionHandler.java

@@ -0,0 +1,58 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+import io.zipcoder.tc_spring_poll_application.excepection.ResourceNotFoundException;
+import javafx.concurrent.Task;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    @Autowired
+    MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(rnfe.getMessage());
+        errorDetail.setDetail(rnfe.getCause().getMessage());
+
+        return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(  MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(new ResourceNotFoundException().getMessage());
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            if(validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                errorDetail.getErrors().put(fe.getField(), validationErrorList);
+            }
+            ValidationError validationError = new ValidationError();
+            validationError.setCode(fe.getCode());
+            validationError.setMessage(messageSource.getMessage(fe, null));
+            validationErrorList.add(validationError);
+        }
+
+        return new ResponseEntity<>(fieldErrors, HttpStatus.NOT_FOUND);
+    }
+
+}

src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java

@@ -0,0 +1,23 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+public class ValidationError {
+
+    private String code;
+    private String message;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

src/main/java/io/zipcoder/tc_spring_poll_application/excepection/RestExceptionHandler.java

@@ -1,26 +0,0 @@
-package io.zipcoder.tc_spring_poll_application.excepection;
-
-import io.zipcoder.tc_spring_poll_application.error.ErrorDetail;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-
-@ControllerAdvice
-public class RestExceptionHandler {
-
-    @ExceptionHandler(ResourceNotFoundException.class)
-    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
-        ErrorDetail errorDetail = new ErrorDetail();
-        errorDetail.setTimeStamp(new Date().getTime());
-        errorDetail.setDeveloperMessage(rnfe.getMessage());
-        errorDetail.setDetail(rnfe.getCause().getMessage());
-
-        return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
-    }
-
-
-}