fixed verifyPoll

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

@@ -44,6 +44,7 @@ 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);
     }
@@ -53,16 +54,12 @@ public class PollController {
         // Save the entity
         verifyPoll(poll);
         Poll p = pollRepository.save(poll);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResponseEntity<>(p, HttpStatus.OK);
     }
 
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
-        try {
-            pollRepository.findOne(pollId);
-        } catch (NullPointerException nullpointer) {
-            throw new ResourceNotFoundException("Poll Id was not found.");
-        }
+        verifyPoll(pollId);
         pollRepository.delete(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
@@ -75,4 +72,11 @@ public class PollController {
         }
     }
 
+    @RequestMapping(method = RequestMethod.GET)
+    public void verifyPoll(Long pollId) throws ResourceNotFoundException {
+        if (pollRepository.findOne(pollId) == null) {
+            throw new ResourceNotFoundException();
+        }
+    }
+
 }