Done

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

@@ -7,25 +7,36 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.PostUpdate;
+
 @RestController
 public class BakerController {
+
     private BakerRepository bakerRepository;
 
-    @GetMapping("/Baker")
+    @Autowired
+    public BakerController(BakerRepository bakerRepository) {
+        this.bakerRepository = bakerRepository;
+    }
+
+
+    @GetMapping("/Baker/")
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> show(Long id) {
+    @GetMapping("/Baker/{id}")
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
     }
 
-    @PostMapping("/Baker")
-    public ResponseEntity<Baker> create(Baker baker) {
+    @PostMapping("/Baker/")
+    public ResponseEntity<Baker> create(@RequestBody Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
+    @PutMapping("/Baker/{id}")
+    public ResponseEntity<Baker> update(@PathVariable Long id, @RequestBody Baker baker) {
         Baker foundBaker = bakerRepository.findById(id).get();
 
         foundBaker.setName(baker.getName());
@@ -34,8 +45,9 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
-        this.bakerRepository.findById(id).get();
+    @DeleteMapping("/Baker/{id}")
+    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

@@ -3,41 +3,47 @@ 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.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Repository;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class MuffinController {
 
-    @Autowired
     private MuffinRepository muffinRepository;
 
-    @GetMapping("/Baker")
+    @Autowired
+    public MuffinController(MuffinRepository muffinRepository) {
+        this.muffinRepository = muffinRepository;
+    }
+
+
+    @GetMapping("/Muffin/")
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> show(Long id) {
+    @GetMapping("/Muffin/{id}")
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
     }
 
-    @PostMapping("/Baker")
-    public ResponseEntity<Muffin> create(Muffin muffin) {
+    @PostMapping("/Muffin/")
+    public ResponseEntity<Muffin> create(@RequestBody Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
+    @PutMapping("/Muffin/{id}")
+    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);
+    @DeleteMapping("/Muffin/{id}")
+    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,23 +1,26 @@
 package com.zipcodewilmington.bakery.Models;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @Entity
 public class Baker {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
     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,16 +1,20 @@
 package com.zipcodewilmington.bakery.Models;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @Entity
 public class Muffin {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column (name = "id")
     private Long id;
 
+    @Column (name = "flavor")
     private String flavor;
 
+    public Muffin() {}
+
     public Muffin(String flavor) {
         this.flavor = flavor;
     }

src/main/java/com/zipcodewilmington/bakery/Repositories/BakerRepository.java

@@ -4,6 +4,6 @@ import com.zipcodewilmington.bakery.Models.Baker;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
-@RestController
+@Repository
 public interface BakerRepository extends CrudRepository<Baker, Long> {
 }

src/main/java/com/zipcodewilmington/bakery/Repositories/MuffinRepository.java

@@ -4,6 +4,6 @@ import com.zipcodewilmington.bakery.Models.Muffin;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
-@RestController
+@Repository
 public interface MuffinRepository extends CrudRepository<Muffin, Long> {
 }