bughunting

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

@@ -4,12 +4,15 @@ 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.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 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
@@ -18,19 +21,19 @@ public class PollController {
     private PollRepository pollRepository;
 
     @Autowired
-    public PollController(PollRepository p) {
-        this.pollRepository = p;
+    public PollController(PollRepository pollRepository) {
+        this.pollRepository = pollRepository;
 
     }
 
     @RequestMapping(value="/polls", method= RequestMethod.GET)
-    public ResponseEntity<Iterable<Poll>> getAllPolls() {
-        Iterable<Poll> allPolls = pollRepository.findAll();
+    public ResponseEntity<Page<Poll>> getAllPolls(Pageable pageable) {
+        Page<Poll> allPolls = pollRepository.findAll(pageable);
         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);
 
         URI newPollUri = ServletUriComponentsBuilder
@@ -52,7 +55,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) {
         // Save the entity
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
@@ -67,6 +70,6 @@ public class PollController {
     public void verifyPoll(Long id)
     {
         if (!pollRepository.exists(id))
-            throw new ResourceNotFoundException();
+            throw new ResourceNotFoundException("Doesn't Exist");
     }
 }

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

@@ -44,7 +44,8 @@ public class ErrorDetail
         this.timeStamp = timeStamp;
     }
 
-    public String getDeveloperMessage() {
+    public String getDeveloperMessage()
+    {
         return developerMessage;
     }
 

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

@@ -18,40 +18,45 @@ import java.util.List;
 @ControllerAdvice
 public class RestExceptionHandler {
 
-    ErrorDetail errorDetail;
+    private final MessageSource messageSource;
 
     @Autowired
-    MessageSource messageSource;
+    public RestExceptionHandler(MessageSource messageSource) {
+        this.messageSource = messageSource;
+    }
+
+
+
 
     @ExceptionHandler(ResourceNotFoundException.class)
     public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request)
     {
-        ErrorDetail errdetail = new ErrorDetail();
-
-        errdetail.setTimeStamp(new Date().getTime());
-        errdetail.setStatus(404);
-        errdetail.setDetail("Resource couldn't be found");
+        ErrorDetail errDetail = new ErrorDetail();
 
-        return null;
+        errDetail.setTimeStamp(new Date().getTime());
+        errDetail.getDeveloperMessage();
+        errDetail.setDetail(rnfe.getLocalizedMessage());
+        return new ResponseEntity<>(errDetail, HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseEntity<?> handleValidationError(  MethodArgumentNotValidException manve,
                             HttpServletRequest request)
     {
+        ErrorDetail errDetail = new ErrorDetail();
         List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
         for(FieldError fe : fieldErrors) {
 
-            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            List<ValidationError> validationErrorList = errDetail.getErrors().get(fe.getField());
             if(validationErrorList == null) {
                 validationErrorList = new ArrayList<>();
-                errorDetail.getErrors().put(fe.getField(), validationErrorList);
+                errDetail.getErrors().put(fe.getField(), validationErrorList);
             }
             ValidationError validationError = new ValidationError();
             validationError.setCode(fe.getCode());
             validationError.setMessage(messageSource.getMessage(fe, null));
             validationErrorList.add(validationError);
         }
-        return null;
+        return new ResponseEntity<>(fieldErrors, HttpStatus.NOT_FOUND);
     }
 }