finished up through part 5

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

@@ -1,6 +1,6 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
-import dtos.VoteResult;
+import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
 import org.springframework.http.HttpStatus;

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

@@ -1,10 +1,11 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
 
 
-import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
@@ -25,17 +27,9 @@ public class PollController {
         this.pollRepository = pollRepository;
     }
 
-    @RequestMapping(value="/polls", method= RequestMethod.GET)
-    public ResponseEntity<Iterable<Poll>> getAllPolls() {
-        Iterable<Poll> allPolls = pollRepository.findAll();
-        return new ResponseEntity<>(allPolls, HttpStatus.OK);
-    }
-
     @RequestMapping(value="/polls", method=RequestMethod.POST)
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll){
-
+    public ResponseEntity<?> createPoll(@Valid @RequestBody Poll poll){
         poll = pollRepository.save(poll);
-
         HttpHeaders responseHeaders = new HttpHeaders();
         URI newPollUri = ServletUriComponentsBuilder
                 .fromCurrentRequest()
@@ -43,29 +37,41 @@ public class PollController {
                 .buildAndExpand(poll.getId())
                 .toUri();
         responseHeaders.setLocation(newPollUri);
-
         return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
     }
 
+    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    public ResponseEntity<Iterable<Poll>> getAllPolls() {
+        Iterable<Poll> allPolls = pollRepository.findAll();
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+
     @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");
+        } }
 
 }

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 java.util.Set;
 
 import javax.persistence.JoinColumn;
@@ -10,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Id;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.validation.constraints.Size;
 
 @Entity
 public class Poll {
@@ -20,11 +23,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/dtos/OptionCount.java → src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java

@@ -1,4 +1,4 @@
-package dtos;
+package io.zipcoder.tc_spring_poll_application.dtos;
 
 public class OptionCount {
     private Long optionId;
@@ -19,4 +19,5 @@ public class OptionCount {
     public void setCount(int count) {
         this.count = count;
     }
+
 }

src/main/java/dtos/VoteResult.java → src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java

@@ -1,4 +1,4 @@
-package dtos;
+package io.zipcoder.tc_spring_poll_application.dtos;
 
 import java.util.Collection;
 

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

@@ -0,0 +1,62 @@
+package io.zipcoder.tc_spring_poll_application.dtos.error;
+
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+
+    private String title;
+    private int status;
+    private String detail;
+    private long timeStamp;
+    private String developerMessage;
+    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 int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+}

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

@@ -0,0 +1,22 @@
+package io.zipcoder.tc_spring_poll_application.dtos.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/exception/ResourceNotFoundException.java

@@ -0,0 +1,13 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+public class ResourceNotFoundException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+    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,65 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import io.zipcoder.tc_spring_poll_application.dtos.error.*;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException
+            (ResourceNotFoundException rnfe, HttpServletRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setStatus(HttpStatus.NOT_FOUND.value());
+        errorDetail.setTitle("Resource Not Found");
+        errorDetail.setDetail(rnfe.getMessage());
+        errorDetail.setDeveloperMessage(rnfe.getClass().getName());
+        return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException
+                                                           manve, HttpServletRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+        // Populate errorDetail instance
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        String requestPath = (String) request.getAttribute("javax.servlet.error.request_uri");
+        if (requestPath == null) {
+            requestPath = request.getRequestURI();
+        }
+        errorDetail.setTitle("Validation Failed");
+        errorDetail.setDetail("Input validation failed");
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
+// Create ValidationError instances
+        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(fe.getDefaultMessage());
+            validationErrorList.add(validationError);
+        }
+        return new ResponseEntity<>(errorDetail, null, HttpStatus.BAD_REQUEST);
+    }
+}

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java

@@ -4,4 +4,5 @@ import org.springframework.data.repository.CrudRepository;
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 
 public interface PollRepository extends CrudRepository<Poll, Long> {
+    
 }

src/main/resources/messages.properties

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