From 83059693832d1a8dd43ca48e73a95cac7ebd5a8c Mon Sep 17 00:00:00 2001 From: MikeGray31 Date: Fri, 6 Dec 2019 16:06:40 -0500 Subject: [PATCH 1/2] All original tests are running --- .../bakery/controllers/BakerController.java | 18 ++++++++++++++---- .../bakery/controllers/MuffinController.java | 17 ++++++++++++++--- .../zipcodewilmington/bakery/models/Baker.java | 5 +++++ .../bakery/models/Muffin.java | 4 ++++ .../bakery/repositories/BakerRepository.java | 2 ++ .../bakery/repositories/MuffinRepository.java | 2 ++ .../bakery/services/BakerService.java | 2 ++ .../bakery/services/MuffinService.java | 2 ++ 8 files changed, 45 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java index b69065c..eb42f5d 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -2,10 +2,16 @@ 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.*; +@Controller public class BakerController { + + @Autowired private BakerService service; public BakerController(BakerService service) { @@ -16,19 +22,23 @@ public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - public ResponseEntity show(Long id) { + @GetMapping(path = "/bakers/{id}") + public ResponseEntity show(@PathVariable("id") Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - public ResponseEntity create(Baker baker) { + @PostMapping(path = "/bakers") + public ResponseEntity create(@RequestBody Baker baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - public ResponseEntity update(Long id, Baker baker) { + @PutMapping + public ResponseEntity update(@PathVariable Long id, @RequestBody Baker baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - public ResponseEntity destroy(Long id) { + @DeleteMapping + public ResponseEntity destroy(@PathVariable Long id) { return new ResponseEntity<>(service.delete(id), HttpStatus.OK); } } diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java index f6b5d42..acaf28f 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -2,10 +2,19 @@ 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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +@Controller public class MuffinController { + + @Autowired private MuffinService service; public MuffinController(MuffinService service) { @@ -16,12 +25,14 @@ public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - public ResponseEntity show(Long id) { + @GetMapping(path = "/muffins/{id}") + public ResponseEntity show(@PathVariable("id") Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - public ResponseEntity create(Muffin baker) { - return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); + @PostMapping(path = "/muffins") + public ResponseEntity create(@RequestBody Muffin muffin) { + return new ResponseEntity<>(service.create(muffin), HttpStatus.CREATED); } public ResponseEntity update(Long id, Muffin baker) { diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java index 8e8c716..42cf156 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java @@ -1,9 +1,14 @@ package com.zipcodewilmington.bakery.models; +import javax.persistence.*; import java.util.Objects; +@Entity public class Baker { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java index 9b374a1..8f93af8 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java @@ -1,9 +1,13 @@ package com.zipcodewilmington.bakery.models; +import javax.persistence.*; import java.util.Objects; +@Entity public class Muffin { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String flavor; diff --git a/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java b/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java index 65923a1..ee03f03 100644 --- a/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java +++ b/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 { } diff --git a/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java b/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java index f63c832..4b8c814 100644 --- a/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java +++ b/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 { } diff --git a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java index 6b2fb31..99f97a2 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java +++ b/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; diff --git a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java index 69ce276..a4b9a06 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java +++ b/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; From ac51cfdcdae2c8b22535a80b6cd3c6bbe99e72a0 Mon Sep 17 00:00:00 2001 From: MikeGray31 Date: Fri, 6 Dec 2019 16:58:54 -0500 Subject: [PATCH 2/2] Finished --- .../bakery/controllers/BakerController.java | 5 +++-- .../bakery/controllers/MuffinController.java | 12 ++++++------ .../com/zipcodewilmington/bakery/models/Baker.java | 5 +++++ .../com/zipcodewilmington/bakery/models/Muffin.java | 3 +++ .../bakery/services/BakerService.java | 1 + 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java index eb42f5d..9f238c5 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +@RequestMapping("api/v1/bakery") @Controller public class BakerController { @@ -32,12 +33,12 @@ public ResponseEntity create(@RequestBody Baker baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - @PutMapping + @PutMapping(path = "/bakers/{id}") public ResponseEntity update(@PathVariable Long id, @RequestBody Baker baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - @DeleteMapping + @DeleteMapping(path = "/bakers/{id}") public ResponseEntity destroy(@PathVariable Long id) { return new ResponseEntity<>(service.delete(id), HttpStatus.OK); } diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java index acaf28f..3475a53 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -6,11 +6,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; +@RequestMapping("api/v1/bakery") @Controller public class MuffinController { @@ -35,11 +33,13 @@ public ResponseEntity create(@RequestBody Muffin muffin) { return new ResponseEntity<>(service.create(muffin), HttpStatus.CREATED); } - public ResponseEntity update(Long id, Muffin baker) { + @PutMapping(path = "/muffins/{id}") + public ResponseEntity update(@PathVariable("id") Long id, @RequestBody Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - public ResponseEntity destroy(Long id) { + @DeleteMapping(path = "/muffins/{id}") + public ResponseEntity destroy(@PathVariable("id") Long id) { return new ResponseEntity<>(service.delete(id), HttpStatus.OK); } } diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java index 42cf156..6852c93 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.bakery.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import javax.persistence.*; import java.util.Objects; @@ -11,10 +13,13 @@ public class Baker { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @JsonProperty("name") private String name; + @JsonProperty("employeeId") private String employeeId; + @JsonProperty("speciality") private String specialty; public Baker() { diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java index 8f93af8..5d64c44 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.bakery.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import javax.persistence.*; import java.util.Objects; @@ -10,6 +12,7 @@ public class Muffin { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @JsonProperty("flavor") private String flavor; public Muffin() { diff --git a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java index 99f97a2..1e3c708 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java @@ -28,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); }