new changes

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

@@ -5,9 +5,8 @@ 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.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class BakerController {
@@ -17,18 +16,25 @@ public class BakerController {
 
     @GetMapping("/bakers")
     public ResponseEntity<Iterable<Baker>> index() {
+
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
-    @GetMapping("/bakers")
-    public ResponseEntity<Baker> show(Long id) {
+
+    @GetMapping("/bakers/{id}")
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
+
         return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
-    @GetMapping("/bakers")
-    public ResponseEntity<Baker> create(Baker baker) {
+
+    @PostMapping("/bakers")
+    public ResponseEntity<Baker> create(@PathVariable Baker baker) {
+
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
-    @GetMapping("/bakers")
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
+
+    @PutMapping("/bakers/{id}")
+    public ResponseEntity<Baker> update(@PathVariable Long id, Baker baker) {
+
         Baker foundBaker = bakerRepository.findOne(id);
 
         foundBaker.setName(baker.getName());
@@ -36,9 +42,12 @@ public class BakerController {
 
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
-    @GetMapping("/bakers")
-    public ResponseEntity<Boolean> destroy(Long id) {
+
+    @DeleteMapping("/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,8 +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.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class MuffinController {
@@ -19,26 +18,26 @@ public class MuffinController {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
 
-    @GetMapping("/bakers")
-    public ResponseEntity<Muffin> show(Long id) {
+    @GetMapping("/muffins{id}")
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
 
-    @GetMapping("/bakers")
-    public ResponseEntity<Muffin> create(Muffin muffin) {
+    @PostMapping("/muffins")
+    public ResponseEntity<Muffin> create(@PathVariable Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
-    @GetMapping("/bakers")
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
+    @PutMapping("/muffins{id}")
+    public ResponseEntity<Muffin> update(@PathVariable Long id, Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
 
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
-    @GetMapping("/bakers")
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @DeleteMapping("/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

@@ -1,20 +1,18 @@
 package com.zipcodewilmington.bakery.Models;
-import org.springframework.data.annotation.Id;
 
+import org.springframework.data.annotation.Id;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 
 @Entity
 public class Baker {
 
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
-
     private String name;
-
     private String employeeId;
-
     private String specialty;
 
     public Baker(String name, String employeeId, String specialty) {

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

@@ -1,15 +1,16 @@
 package com.zipcodewilmington.bakery.Models;
+
 import org.springframework.data.annotation.Id;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 
 @Entity
 public class Muffin {
 
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
-
     private String flavor;
 
     public Muffin(String flavor) {