annotations

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

@@ -2,8 +2,10 @@ 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.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -11,20 +13,25 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping
 public class BakerController {
 
+    @Autowired
     private BakerRepository bakerRepository;
 
+    @GetMapping(value = "/baker")
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
+    @GetMapping(value = "/baker/{id}")
     public ResponseEntity<Baker> show(Long id) {
         return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
 
+    @GetMapping(value = "/baker")
     public ResponseEntity<Baker> create(Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
+    @GetMapping(value = "/baker/{id}")
     public ResponseEntity<Baker> update(Long id, Baker baker) {
         Baker foundBaker = bakerRepository.findOne(id);
 
@@ -34,6 +41,7 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
+    @GetMapping(value = "/baker/{id}")
     public ResponseEntity<Boolean> destroy(Long id) {
         this.bakerRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);

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

@@ -17,20 +17,21 @@ public class MuffinController {
     @Autowired
     private MuffinRepository muffinRepository;
 
-    @GetMapping(value="/polls/votes")
+    @GetMapping(value="/muffin")
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
 
-
+    @GetMapping(value="/muffin/{id}")
     public ResponseEntity<Muffin> show(Long id) {
         return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
-
+    @GetMapping(value = "/muffin")
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
+    @GetMapping(value ="/muffin/{id}")
     public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
@@ -38,6 +39,7 @@ public class MuffinController {
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
+    @GetMapping(value = "/muffin/{id}")
     public ResponseEntity<Boolean> destroy(Long id) {
         this.muffinRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);

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

@@ -1,5 +1,7 @@
 package com.zipcodewilmington.bakery.Models;
 
+import org.springframework.web.bind.annotation.PathVariable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -9,13 +11,16 @@ import javax.persistence.Id;
 public class Baker {
     @Id
     @GeneratedValue
+    @Column(name = "id")
     private Long id;
 
-    @Column
+    @Column(name = "bakerName")
     private String name;
-    @Column
+
+    @Column(name = "employeeId")
     private String employeeId;
-    @Column
+
+    @Column(name = "specialty")
     private String specialty;
 
     public Baker(String name, String employeeId, String specialty) {

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

@@ -2,14 +2,18 @@ package com.zipcodewilmington.bakery.Models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 @Entity
 public class Muffin {
 
     @Id
+    @GeneratedValue
+    @Column(name = "id")
     private Long id;
-    @Column
+
+    @Column(name = "flavor")
     private String flavor;
 
     public Muffin(String flavor) {