diff --git a/src/main/java/com/microsoft/azure/sample/controller/TodoListController.java b/src/main/java/com/microsoft/azure/sample/controller/TodoListController.java
index cacd3126..fc13db0f 100644
--- a/src/main/java/com/microsoft/azure/sample/controller/TodoListController.java
+++ b/src/main/java/com/microsoft/azure/sample/controller/TodoListController.java
@@ -26,7 +26,7 @@ public TodoListController() {
 
     @RequestMapping("/home")
     public Map<String, Object> home() {
-        final Map<String, Object> model = new HashMap<String, Object>();
+        final Map<String, Object> model = new HashMap<>();
         model.put("id", UUID.randomUUID().toString());
         model.put("content", "home");
         return model;
@@ -35,20 +35,19 @@ public Map<String, Object> home() {
     /**
      * HTTP GET
      */
-    @RequestMapping(value = "/api/todolist/{index}",
-            method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_VALUE})
+    @GetMapping(value = "/api/todolist/{index}", produces = {MediaType.APPLICATION_JSON_VALUE})
     public ResponseEntity<?> getTodoItem(@PathVariable("index") String index) {
         try {
-            return new ResponseEntity<TodoItem>(todoItemRepository.findById(index).get(), HttpStatus.OK);
+            return new ResponseEntity<>(todoItemRepository.findById(index).get(), HttpStatus.OK);
         } catch (Exception e) {
-            return new ResponseEntity<String>(index + " not found", HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(index + " not found", HttpStatus.NOT_FOUND);
         }
     }
 
     /**
      * HTTP GET ALL
      */
-    @RequestMapping(value = "/api/todolist", method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_VALUE})
+    @GetMapping(value = "/api/todolist", produces = {MediaType.APPLICATION_JSON_VALUE})
     public ResponseEntity<?> getAllTodoItems() {
         try {
             return new ResponseEntity<>(todoItemRepository.findAll(), HttpStatus.OK);
@@ -60,41 +59,41 @@ public ResponseEntity<?> getAllTodoItems() {
     /**
      * HTTP POST NEW ONE
      */
-    @RequestMapping(value = "/api/todolist", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/api/todolist", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> addNewTodoItem(@RequestBody TodoItem item) {
         try {
             item.setID(UUID.randomUUID().toString());
             todoItemRepository.save(item);
-            return new ResponseEntity<String>("Entity created", HttpStatus.CREATED);
+            return new ResponseEntity<>("Entity created", HttpStatus.CREATED);
         } catch (Exception e) {
-            return new ResponseEntity<String>("Entity creation failed", HttpStatus.CONFLICT);
+            return new ResponseEntity<>("Entity creation failed", HttpStatus.CONFLICT);
         }
     }
 
     /**
      * HTTP PUT UPDATE
      */
-    @RequestMapping(value = "/api/todolist", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PutMapping(value = "/api/todolist", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> updateTodoItem(@RequestBody TodoItem item) {
         try {
             todoItemRepository.deleteById(item.getID());
             todoItemRepository.save(item);
-            return new ResponseEntity<String>("Entity updated", HttpStatus.OK);
+            return new ResponseEntity<>("Entity updated", HttpStatus.OK);
         } catch (Exception e) {
-            return new ResponseEntity<String>("Entity updating failed", HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>("Entity updating failed", HttpStatus.NOT_FOUND);
         }
     }
 
     /**
      * HTTP DELETE
      */
-    @RequestMapping(value = "/api/todolist/{id}", method = RequestMethod.DELETE)
+    @DeleteMapping(value = "/api/todolist/{id}")
     public ResponseEntity<String> deleteTodoItem(@PathVariable("id") String id) {
         try {
             todoItemRepository.deleteById(id);
-            return new ResponseEntity<String>("Entity deleted", HttpStatus.OK);
+            return new ResponseEntity<>("Entity deleted", HttpStatus.OK);
         } catch (Exception e) {
-            return new ResponseEntity<String>("Entity deletion failed", HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>("Entity deletion failed", HttpStatus.NOT_FOUND);
         }
 
     }