up to 5.5

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

@@ -1,6 +1,7 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -25,7 +26,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);
         HttpHeaders httpHeaders = new HttpHeaders();
         URI newPollUri = ServletUriComponentsBuilder
@@ -39,12 +40,14 @@ public class PollController {
 
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
     public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
         Poll p = pollRepository.findOne(pollId);
         return new ResponseEntity<> (p, HttpStatus.OK);
     }
 
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+        verifyPoll(pollId);
         // Save the entity
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
@@ -52,11 +55,21 @@ public class PollController {
 
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
         pollRepository.delete(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-}
 
+    public void verifyPoll(@PathVariable Long pollId){
+       if(!pollRepository.exists(pollId)){
+           throw new ResourceNotFoundException("Poll with id does not exist");
+       }
+    }
+}
 
+//checks if a specific poll id exists and throws a
+//        ResourceNotFoundException if not. Use this in any
+//        method that searches for or updates an existing poll
+//        (eg: Get, Put, and Delete methods).
 
 

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.HashSet;
 import java.util.Set;
 
@@ -13,11 +16,13 @@ public class Poll {
     private long id;
 
     @Column(name = "QUESTION")
+    @NotEmpty
     private String questions;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
+    @Size(min=2, max = 6)
     private Set<Option> options;
 
     public long getId() {
@@ -45,3 +50,9 @@ public class Poll {
     }
 }
 
+// In the Poll class:
+// options should be @Size(min=2, max = 6)
+//question should be @NotEmpty
+//To enforce these validations, add @Valid annotations to Poll objects in
+//RequestMapping-annotated controller methods
+// (there should be 2)...only found one check this!!!!!

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

@@ -0,0 +1,72 @@
+package io.zipcoder.tc_spring_poll_application.dto.error;
+
+public class ErrorDetail {
+
+    private String title;
+    private int status;
+    private String detail;
+    private long timeStamp;
+    private String developerMessage;
+
+    /**
+     *
+     * @return a brief title of the error condition, eg: "Validation Failure" or "Internal Server Error"
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     *
+     * @return the HTTP status code for the current request; redundant but useful for client-side error handling
+     */
+    public int getStatus() {
+        return status;
+    }
+
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    /**
+     *
+     * @return A short, human-readable description of the error that may be presented to a user
+     */
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    /**
+     *
+     * @return the time in milliseconds when the error occurred
+     */
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    /**
+     *
+     * @return detailed information such as exception class name or a stack trace useful for developers to debug
+     */
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+}
+

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

@@ -0,0 +1,21 @@
+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 ResourceNotFoundException extends RuntimeException {
+
+    public ResourceNotFoundException() {
+    }
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+    public ResourceNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
+

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

@@ -0,0 +1,33 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import io.zipcoder.tc_spring_poll_application.dto.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 customError = new ErrorDetail();
+        customError.setDetail(rnfe.getMessage());
+        customError.setDeveloperMessage(rnfe.getStackTrace().toString());
+        customError.setStatus(404);
+        customError.setTimeStamp(new Date().getTime());
+        customError.setTitle("Resource Not Found");
+
+        return new ResponseEntity<>(customError, null, HttpStatus.NOT_FOUND);
+    }
+}
+
+
+//Create RestExceptionHandler class annotated with @ControllerAdvice
+//Create a handler method with the header shown below
+// Populate an ErrorDetail object in the method, and
+//return a ResponseEntity containing the ErrorDetail and an HTTP NOT_FOUND status
+//Use java.util's new Date().getTime() for the timestamp
+//Provide the detail and developer messages from the ResourceNotFoundException