loaded dummy data, 6.1

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

@@ -0,0 +1,68 @@
+package io.zipcoder.tc_spring_poll_application;
+
+import io.zipcoder.tc_spring_poll_application.dtos.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.dtos.error.ValidationError;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+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.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@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);
+//    }
+    @Inject
+    private MessageSource messageSource;
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public @ResponseBody
+    ErrorDetail 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);
+            return errorDetail;
+        }
+}

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;
@@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 import javax.inject.Inject;
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
@@ -23,11 +25,22 @@ 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);
+
+    //Set the location header for the newly created resource
+    HttpHeaders responseHeaders = new HttpHeaders();
+
     URI newPollUri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(poll.getId()).toUri();
+    responseHeaders.setLocation(newPollUri);
     return new ResponseEntity<>(new HttpHeaders(), HttpStatus.CREATED);
   }
+  public void verifyPoll(Long pollId) throws ResourceNotFoundException {
+    Poll poll = pollRepository.findOne(pollId);
+    if(poll == null) {
+      throw new ResourceNotFoundException("Poll with id " + pollId + " not found");
+    }
+  }
   @RequestMapping(value="/polls/{pollId}", method= RequestMethod.GET)
   public ResponseEntity<?> getPoll(@PathVariable Long pollId){
     Poll poll = pollRepository.findOne(pollId);

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

@@ -15,6 +15,9 @@ public class Option {
     @Column(name = "OPTION_VALUE")
     private String value;
 
+    @Column(name = "POLL_ID")
+    private Long pollId;
+
     public Long getId() {
         return id;
     }
@@ -30,4 +33,12 @@ public class Option {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public Long getPollId() {
+        return pollId;
+    }
+
+    public void setPollId(Long pollId) {
+        this.pollId = 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() {
@@ -42,4 +47,5 @@ public class Poll {
     public void setOptions(Set<Option> options) {
         this.options = options;
     }
+
 }

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.HashMap;
+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 = new HashMap<String, List<ValidationError>>();
+
+    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;
+    }
+
+    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/dtos/error/ValidationError.java

@@ -0,0 +1,23 @@
+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,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{
+
+    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/repositories/PollRepository.java

@@ -1,6 +1,10 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 public interface PollRepository extends CrudRepository<Poll, Long> {
+
 }

src/main/resources/import.sql

@@ -0,0 +1,7 @@
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+insert into option (option_id, option_value, poll_id) values (1, 'Red', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'Blue', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Yellow', 1);
+
+
+

src/main/resources/messages.properties

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