at part 5 and I'm almost done

README.md

@@ -461,7 +461,7 @@ public class ComputeResultController {
 
 ## Part 5.1 - Create `ResourceNotFoundException`
 
-- Create a `exception` package inside of `io.zipcoder.springdemo.QuickPollApplication`
+- Create a `io.zipcoder.tc_spring_poll_application.exception` package inside of `io.zipcoder.springdemo.QuickPollApplication`
 - Create a `ResourceNotFoundException` class that extends `RuntimeException`. We'll use this to signal when a requested resource is not found.
 - Annotate the `ResourceNotFoundException` class with `@ResponseStatus(HttpStatus.NOT_FOUND)`. This informs Spring that any request mapping that throws a `ResourceNotFoundException` should result in a `404 NOT FOUND` http status.
 - Implement three constructors
@@ -478,7 +478,7 @@ Create a void method in `PollController` called `verifyPoll` that checks if a sp
 
 ## Part 5.3 - Create custom Error Responses
 
-Spring provides some built-in exception handling and error response, but we'll customize it a bit here. Create an `ErrorDetail` class in a new `io.zipcoder.tc_spring_poll_application.dto.error` package to hold relevant information any time an error occurs.
+Spring provides some built-in io.zipcoder.tc_spring_poll_application.exception handling and error response, but we'll customize it a bit here. Create an `ErrorDetail` class in a new `io.zipcoder.tc_spring_poll_application.dto.error` package to hold relevant information any time an error occurs.
 
 Fields (Don't forget to provide getters and setters):
 
@@ -486,12 +486,12 @@ Fields (Don't forget to provide getters and setters):
 - `int status`: the HTTP status code for the current request; redundant but useful for client-side error handling
 - `String detail`: A short, human-readable description of the error that may be presented to a user
 - `long timeStamp`: the time in milliseconds when the error occurred
-- `String developerMessage`: detailed information such as exception class name or a stack trace useful for developers to debug
+- `String developerMessage`: detailed information such as io.zipcoder.tc_spring_poll_application.exception class name or a stack trace useful for developers to debug
 
 
 ## Part 5.4 - Create a `@ControllerAdvice`
 
-In this section we add custom handling for the exceptions we created before. A `@ControllerAdvice` is an AOP feature that wraps a controller and adds some functionality when needed. In this case we are adding functionality only when an exception is thrown.
+In this section we add custom handling for the exceptions we created before. A `@ControllerAdvice` is an AOP feature that wraps a controller and adds some functionality when needed. In this case we are adding functionality only when an io.zipcoder.tc_spring_poll_application.exception is thrown.
 
 - Create RestExceptionHandler class annotated with `@ControllerAdvice`
 - Create a handler method with the header shown below

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

@@ -0,0 +1,4 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+public class ControllerAdvice {
+}

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

@@ -9,6 +9,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundError;
 
 import javax.validation.Valid;
 import java.net.URI;
@@ -17,7 +18,7 @@ import java.net.URI;
 @RestController
 public class PollController {
 
-    public PollRepository pollRepository;
+    private PollRepository pollRepository;
 
     @Autowired
     public PollController(PollRepository pollRepository) {
@@ -50,28 +51,35 @@ public class PollController {
     @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET)
     public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
         Poll p = pollRepository.findOne(pollId);
+        verifyPoll(pollId);
         return new ResponseEntity<>(p, HttpStatus.OK);
     }
 
     @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) {
         // Save the entity
 
         Poll p = pollRepository.save(poll);
+        verifyPoll(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
         pollRepository.delete(pollId);
+        verifyPoll(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-//    protected void verifyPoll(Long pollId) throws ResourceNotFoundException{
-//        Poll poll = pollRepository.findOne(pollId);
-//        if(poll == null){
-//            throw new ResourceNotFoundException("Poll with id "+ pollId + "not found");
-//        }
-//    }
+
+    //io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundError
+    protected void verifyPoll(Long pollId) throws ResourceNotFoundError {
+        Poll poll = pollRepository.findOne(pollId);
+        if (poll == null) {
+            throw new ResourceNotFoundError("Poll with id " + pollId + " not found");
+        }
+    }
+
+
 
 
 }

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

@@ -1,5 +1,7 @@
 package io.zipcoder.tc_spring_poll_application.domain;
-
+import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import javax.validation.Valid;
 
 import org.hibernate.validator.constraints.NotEmpty;
 

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

@@ -0,0 +1,71 @@
+package io.zipcoder.tc_spring_poll_application.dto.error;
+
+import org.springframework.http.HttpStatus;
+
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+
+    private String title;
+
+    private String detail;
+
+    private String developerMessage;
+    private long timeStamp;
+    private int status;
+    private Map<String, List<ValidationError>> errors;
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+
+
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+}

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

@@ -0,0 +1,23 @@
+package io.zipcoder.tc_spring_poll_application.dto.error;
+
+public class ValidationError {
+
+    String code;
+    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/exception/ResourceNotFoundError.java

@@ -0,0 +1,25 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundError extends RuntimeException {
+
+
+
+
+    public ResourceNotFoundError(){
+
+    }
+
+    public ResourceNotFoundError(String message){
+        super(message);
+    }
+
+    public ResourceNotFoundError(String message, Throwable cause){
+
+        super(message,cause);
+    }
+
+}

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

@@ -0,0 +1,76 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import io.zipcoder.tc_spring_poll_application.dto.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.dto.error.ValidationError;
+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 org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    private MessageSource messageSource;
+
+
+    @ExceptionHandler(ResourceNotFoundError.class)
+    ResponseEntity<?> ResourceNotFoundError(ResourceNotFoundError rnfe, HttpServletRequest request) throws Exception{
+
+        ErrorDetail errors = new ErrorDetail();
+
+        errors.setTimeStamp(new Date().getTime());
+        errors.setStatus(HttpStatus.NOT_FOUND.value());
+        errors.setTitle("Resource not Found");
+        errors.setDetail(rnfe.getMessage());
+        errors.setDeveloperMessage(rnfe.getClass().getName());
+
+        return new ResponseEntity<>(errors,null,HttpStatus.NOT_FOUND);
+
+    }
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public @ResponseBody
+    ErrorDetail handleValidationError(  MethodArgumentNotValidException manve, HttpServletRequest request){
+
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        String requestPath = (String) request.getAttribute("java.servlet.error.request_uri");
+
+        if(requestPath == null){
+            requestPath = request.getRequestURI();
+        }
+
+        errorDetail.setTitle("Bad entry, Validating Error");
+        errorDetail.setDetail("Input validation fail");
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            if(validationErrorList == null) {
+                validationErrorList = new ArrayList<ValidationError>();
+                errorDetail.getErrors().put(fe.getField(), validationErrorList);
+            }
+            ValidationError validationError = new ValidationError();
+            validationError.setCode(fe.getCode());
+            validationError.setMessage(messageSource.getMessage(fe, null));
+            validationErrorList.add(validationError);
+        }
+        return errorDetail;
+    }
+
+
+}

src/test/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundExceptionTest.java

@@ -0,0 +1,15 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.boot.context.config.ResourceNotFoundException;
+import org.springframework.core.io.Resource;
+
+public class ResourceNotFoundExceptionTest extends ResourceNotFoundException {
+
+    
+
+
+
+    public ResourceNotFoundExceptionTest(String propertyName, Resource resource) {
+        super(propertyName, resource);
+    }
+}