done

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

@@ -2,25 +2,38 @@ package com.zipcodewilmington.bakery.Controllers;
 
 import com.zipcodewilmington.bakery.Models.Baker;
 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.*;
 
+@RestController
 public class BakerController {
     private BakerRepository bakerRepository;
 
-    public ResponseEntity<Iterable<Baker>> index() {
+    @Autowired
+    public BakerController(BakerRepository bakerRepository)
+    {
+        this.bakerRepository = bakerRepository;
+    }
+
+    @RequestMapping(value = "/bakers", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Baker>> index()
+    {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> show(Long id) {
+    @RequestMapping(value = "/bakers/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
     }
-
-    public ResponseEntity<Baker> create(Baker baker) {
+    @RequestMapping(value = "/bakers", method = RequestMethod.POST)
+    public ResponseEntity<Baker> create(@RequestBody Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
-
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
+    @RequestMapping(value = "/bakers/{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Baker> update(@PathVariable Long id, @RequestBody Baker baker)
+    {
         Baker foundBaker = bakerRepository.findById(id).get();
 
         foundBaker.setName(baker.getName());
@@ -28,9 +41,10 @@ public class BakerController {
 
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
-
-    public ResponseEntity<Boolean> destroy(Long id) {
-        this.bakerRepository.findById(id).get();
+    @RequestMapping(value = "/bakers/{id}", method = RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id)
+    {
+        this.bakerRepository.delete(this.bakerRepository.findById(id).get());
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 }

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

@@ -2,35 +2,43 @@ package com.zipcodewilmington.bakery.Controllers;
 
 import com.zipcodewilmington.bakery.Models.Muffin;
 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.*;
 
-public class MuffinController {
-
+@RestController
+public class MuffinController
+{
     private MuffinRepository muffinRepository;
 
+    @Autowired
+    public MuffinController(MuffinRepository muffinRepository) {
+        this.muffinRepository = muffinRepository;
+    }
+    @RequestMapping(value = "/muffins", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
-
-    public ResponseEntity<Muffin> show(Long id) {
+    @RequestMapping(value = "/muffins/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
     }
-
+    @RequestMapping(value = "/muffins", method = RequestMethod.POST)
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
-
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
+    @RequestMapping(value = "/muffins/{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Muffin> update(@PathVariable Long id, @RequestBody Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findById(id).get();
         foundMuffin.setFlavor(muffin.getFlavor());
 
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
-
-    public ResponseEntity<Boolean> destroy(Long id) {
-        this.muffinRepository.deleteById(id);
+    @RequestMapping(value = "/muffins/{id}", method = RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id)
+    {
+        this.muffinRepository.delete(this.muffinRepository.findById(id).get());
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
-
 }

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

@@ -1,14 +1,28 @@
 package com.zipcodewilmington.bakery.Models;
 
-public class Baker {
+import javax.persistence.*;
+
+@Entity
+public class Baker
+{
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "bakerId")
     private Long id;
 
+    @Column(name = "Name")
     private String name;
 
+    @Column(name = "employeeId")
     private String employeeId;
 
+    @Column(name = "specialty")
     private String specialty;
 
+    public Baker() {
+
+    }
+
     public Baker(String name, String employeeId, String specialty) {
         this.name = name;
         this.employeeId = employeeId;

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

@@ -1,14 +1,27 @@
 package com.zipcodewilmington.bakery.Models;
 
-public class Muffin {
+import javax.persistence.*;
+
+@Entity
+public class Muffin
+{
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+
+    @Column(name = "muffin_id")
     private Long id;
 
+    @Column(name = "flavor")
     private String flavor;
 
     public Muffin(String flavor) {
         this.flavor = flavor;
     }
 
+    public Muffin() {
+    }
+
+
     public Long getId() {
         return id;
     }