All finished

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

@@ -2,10 +2,17 @@
 
 import com.zipcodewilmington.bakery.models.Baker;
 import com.zipcodewilmington.bakery.services.BakerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
+@RequestMapping("api/v1/bakery")
+@Controller
 public class BakerController {
+
+    @Autowired
     private BakerService service;
 
     public BakerController(BakerService service) {
@@ -16,19 +23,23 @@ public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(service.index(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> show(Long id) {
+    @GetMapping(path = "/bakers/{id}")
+    public ResponseEntity<Baker> show(@PathVariable("id") Long id) {
         return new ResponseEntity<>(service.show(id), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> create(Baker baker) {
+    @PostMapping(path = "/bakers")
+    public ResponseEntity<Baker> create(@RequestBody Baker baker) {
         return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
+    @PutMapping(path = "/bakers/{id}")
+    public ResponseEntity<Baker> update(@PathVariable Long id, @RequestBody Baker baker) {
         return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @DeleteMapping(path = "/bakers/{id}")
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         return new ResponseEntity<>(service.delete(id), HttpStatus.OK);
     }
 }

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

@@ -2,10 +2,17 @@
 
 import com.zipcodewilmington.bakery.models.Muffin;
 import com.zipcodewilmington.bakery.services.MuffinService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
+@RequestMapping("api/v1/bakery")
+@Controller
 public class MuffinController {
+
+    @Autowired
     private MuffinService service;
 
     public MuffinController(MuffinService service) {
@@ -16,19 +23,23 @@ public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(service.index(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> show(Long id) {
+    @GetMapping(path = "/muffins/{id}")
+    public ResponseEntity<Muffin> show(@PathVariable("id") Long id) {
         return new ResponseEntity<>(service.show(id), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> create(Muffin baker) {
-        return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED);
+    @PostMapping(path = "/muffins")
+    public ResponseEntity<Muffin> create(@RequestBody Muffin muffin) {
+        return new ResponseEntity<>(service.create(muffin), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Muffin> update(Long id, Muffin baker) {
+    @PutMapping(path = "/muffins/{id}")
+    public ResponseEntity<Muffin> update(@PathVariable("id") Long id, @RequestBody Muffin baker) {
         return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @DeleteMapping(path = "/muffins/{id}")
+    public ResponseEntity<Boolean> destroy(@PathVariable("id") Long id) {
         return new ResponseEntity<>(service.delete(id), HttpStatus.OK);
     }
 }

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

@@ -1,15 +1,25 @@
 package com.zipcodewilmington.bakery.models;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.persistence.*;
 import java.util.Objects;
 
+@Entity
 public class Baker {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @JsonProperty("name")
     private String name;
 
+    @JsonProperty("employeeId")
     private String employeeId;
 
+    @JsonProperty("speciality")
     private String specialty;
 
     public Baker() {

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

@@ -1,11 +1,18 @@
 package com.zipcodewilmington.bakery.models;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.persistence.*;
 import java.util.Objects;
 
+@Entity
 public class Muffin {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @JsonProperty("flavor")
     private String flavor;
 
     public Muffin() {

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

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

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

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

src/main/java/com/zipcodewilmington/bakery/services/BakerService.java

@@ -2,7 +2,9 @@
 
 import com.zipcodewilmington.bakery.models.Baker;
 import com.zipcodewilmington.bakery.repositories.BakerRepository;
+import org.springframework.stereotype.Service;
 
+@Service
 public class BakerService {
     private BakerRepository repository;
 
@@ -26,6 +28,7 @@ public Baker update(Long id, Baker newBakerData) {
         Baker originalBaker = repository.findById(id).get();
         originalBaker.setName(newBakerData.getName());
         originalBaker.setSpecialty(newBakerData.getSpecialty());
+        originalBaker.setEmployeeId(newBakerData.getEmployeeId());
         return repository.save(originalBaker);
     }
 

src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java

@@ -2,7 +2,9 @@
 
 import com.zipcodewilmington.bakery.models.Muffin;
 import com.zipcodewilmington.bakery.repositories.MuffinRepository;
+import org.springframework.stereotype.Service;
 
+@Service
 public class MuffinService {
     private MuffinRepository repository;