final

src/main/java/com/zipcodewilmington/bakery/Controllers/BakerController.java

@@ -5,10 +5,7 @@ import com.zipcodewilmington.bakery.Repositories.BakerRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class BakerController {
@@ -20,30 +17,30 @@ public class BakerController {
         this.bakerRepository = bakerRepository;
     }
 
-    @RequestMapping(value="/bakers", method= RequestMethod.GET)
+    @GetMapping(value="/bakers")
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
-    @RequestMapping(value="/bakers/{BAKER_ID}", method=RequestMethod.GET)
+    @GetMapping(value="/bakers/{id}")
     public ResponseEntity<Baker> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
 
-    @RequestMapping(value="/bakers", method= RequestMethod.POST)
-    public ResponseEntity<Baker> create(Baker baker) {
+    @PostMapping(value="/bakers")
+    public ResponseEntity<Baker> create(@RequestBody Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
-    @RequestMapping(value="/bakers/{BAKER_ID}", method=RequestMethod.PUT)
-    public ResponseEntity<Baker> update(@PathVariable Long id, Baker baker) {
+    @PutMapping(value="/bakers/{id}")
+    public ResponseEntity<Baker> update(@PathVariable Long id, @RequestBody Baker baker) {
         Baker foundBaker = bakerRepository.findOne(id);
         foundBaker.setName(baker.getName());
         foundBaker.setSpecialty(baker.getSpecialty());
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
-    @RequestMapping(value="/bakers/{BAKER_ID}", method=RequestMethod.DELETE)
+    @DeleteMapping(value="/bakers/{id}")
     public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         this.bakerRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);

src/main/java/com/zipcodewilmington/bakery/Controllers/MuffinController.java

@@ -5,10 +5,7 @@ import com.zipcodewilmington.bakery.Repositories.MuffinRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class MuffinController {
@@ -20,22 +17,22 @@ public class MuffinController {
         this.muffinRepository = muffinRepository;
     }
 
-    @RequestMapping(value="/muffins", method= RequestMethod.GET)
+    @GetMapping(value="/muffins")
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
 
-    @RequestMapping(value="/muffins/{MUFFIN_ID}", method=RequestMethod.GET)
+    @GetMapping(value="/muffins/{id}")
     public ResponseEntity<Muffin> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
 
-    @RequestMapping(value="/muffins", method= RequestMethod.POST)
+    @PostMapping(value="/muffins")
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
-    @RequestMapping(value="/muffin/{MUFFIN_ID}", method=RequestMethod.PUT)
+    @PutMapping(value="/muffin/{id}")
     public ResponseEntity<Muffin> update(@PathVariable Long id, Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
@@ -43,7 +40,7 @@ public class MuffinController {
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
-    @RequestMapping(value="/muffins/{MUFFIN_ID}", method=RequestMethod.DELETE)
+    @DeleteMapping(value="/muffins/{id}")
     public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         this.muffinRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);

src/main/java/com/zipcodewilmington/bakery/Models/Baker.java

@@ -16,7 +16,7 @@ public class Baker {
     @Column(name = "NAME")
     private String name;
 
-    @Column(name = "EMPLOYEEID")
+    @Column(name = "EMPLOYEE_ID")
     private String employeeId;
 
     @Column(name = "SPECIALTY")
@@ -28,6 +28,8 @@ public class Baker {
         this.specialty = specialty;
     }
 
+    public Baker() { }
+
     public Long getId() {
         return id;
     }

src/main/java/com/zipcodewilmington/bakery/Models/Muffin.java

@@ -16,6 +16,8 @@ public class Muffin {
     @Column(name = "FLAVOR")
     private String flavor;
 
+    public Muffin() { }
+
     public Muffin(String flavor) {
         this.flavor = flavor;
     }