From 72ac51c982733d02ef0dbdcb0aa2e2c7fc0ded6e Mon Sep 17 00:00:00 2001 From: Jbanksalpha <78812718+Jbanksalpha@users.noreply.github.com> Date: Thu, 22 Apr 2021 13:38:08 -0400 Subject: [PATCH 1/2] added annotations to lab --- .../bakery/controllers/BakerController.java | 20 ++++++++++++------- .../bakery/controllers/MuffinController.java | 20 ++++++++++++------- .../bakery/models/Baker.java | 8 +++++++- .../bakery/models/Muffin.java | 6 ++++++ .../bakery/repositories/BakerRepository.java | 2 ++ .../bakery/repositories/MuffinRepository.java | 2 ++ .../bakery/services/BakerService.java | 4 ++++ .../bakery/services/MuffinService.java | 2 ++ 8 files changed, 49 insertions(+), 15 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..619cd76 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -2,33 +2,39 @@ 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.web.bind.annotation.*; +@RestController public class BakerController { private BakerService service; + @Autowired public BakerController(BakerService service) { this.service = service; } + + @GetMapping("/bakers") public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - - public ResponseEntity show(Long id) { + @GetMapping("/bakers/{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - + @PostMapping("/bakers") public ResponseEntity create(Baker baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - - public ResponseEntity update(Long id, Baker baker) { + @PutMapping("/bakers/{id}") + public ResponseEntity update(@PathVariable Long id, Baker baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - - public ResponseEntity destroy(Long id) { + @DeleteMapping("/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 f6b5d42..8fe6ed3 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -2,33 +2,39 @@ 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.web.bind.annotation.*; +@RestController public class MuffinController { private MuffinService service; + + @Autowired public MuffinController(MuffinService service) { this.service = service; } + @GetMapping("/bakers") public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - - public ResponseEntity show(Long id) { + @GetMapping("/bakers/{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - + @PostMapping("/bakers") public ResponseEntity create(Muffin baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - - public ResponseEntity update(Long id, Muffin baker) { + @PutMapping("/bakers/{id}") + public ResponseEntity update(@PathVariable Long id, Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - - public ResponseEntity destroy(Long id) { + @DeleteMapping("/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/models/Baker.java b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java index 8e8c716..ed50611 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java @@ -1,9 +1,15 @@ package com.zipcodewilmington.bakery.models; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; import java.util.Objects; - +@Entity public class Baker { + + @Id @GeneratedValue(strategy = GenerationType.AUTO) 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..c183693 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java @@ -1,9 +1,15 @@ package com.zipcodewilmington.bakery.models; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; import java.util.Objects; +@Entity public class Muffin { + @Id @GeneratedValue(strategy = GenerationType.AUTO) 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..398a10a 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java @@ -2,8 +2,12 @@ import com.zipcodewilmington.bakery.models.Baker; import com.zipcodewilmington.bakery.repositories.BakerRepository; +import org.springframework.stereotype.Service; +@Service public class BakerService { + + private BakerRepository repository; public BakerService(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 11b2e955f9d144b1010cba6b1a7d682fb1b3d380 Mon Sep 17 00:00:00 2001 From: Jbanksalpha <78812718+Jbanksalpha@users.noreply.github.com> Date: Thu, 22 Apr 2021 14:09:02 -0400 Subject: [PATCH 2/2] made changes to the annotations, ran in postman --- .../bakery/controllers/BakerController.java | 6 ++++-- .../bakery/controllers/MuffinController.java | 16 +++++++++------- .../zipcodewilmington/bakery/models/Baker.java | 2 +- .../zipcodewilmington/bakery/models/Muffin.java | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java index 619cd76..a6832f7 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -7,6 +7,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; + @RestController public class BakerController { private BakerService service; @@ -26,11 +28,11 @@ public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } @PostMapping("/bakers") - public ResponseEntity create(Baker baker) { + public ResponseEntity create(@RequestBody Baker baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } @PutMapping("/bakers/{id}") - public ResponseEntity update(@PathVariable Long id, Baker baker) { + public ResponseEntity update(@PathVariable Long id, @RequestBody Baker baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } @DeleteMapping("/bakers/{id}") diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java index 8fe6ed3..244be6d 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -7,6 +7,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; + @RestController public class MuffinController { private MuffinService service; @@ -17,23 +19,23 @@ public MuffinController(MuffinService service) { this.service = service; } - @GetMapping("/bakers") + @GetMapping("/muffins") public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - @GetMapping("/bakers/{id}") + @GetMapping("/muffins/{id}") public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - @PostMapping("/bakers") - public ResponseEntity create(Muffin baker) { + @PostMapping("/muffins") + public ResponseEntity create(@RequestBody Muffin baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - @PutMapping("/bakers/{id}") - public ResponseEntity update(@PathVariable Long id, Muffin baker) { + @PutMapping("/muffins/{id}") + public ResponseEntity update(@PathVariable Long id, @Valid @RequestBody Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - @DeleteMapping("/bakers/{id}") + @DeleteMapping("/muffins/{id}") public ResponseEntity destroy(@PathVariable 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 ed50611..0789d03 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java @@ -9,7 +9,7 @@ @Entity public class Baker { - @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Id @GeneratedValue 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 c183693..4781edc 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java @@ -9,7 +9,7 @@ @Entity public class Muffin { - @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Id @GeneratedValue private Long id; private String flavor;