From 5cd863a6ca1ce8d717bdeccde23aef16ee9c96ad Mon Sep 17 00:00:00 2001 From: sitarameez Date: Fri, 13 Aug 2021 23:08:16 -0400 Subject: [PATCH 1/3] almost --- .../bakery/controllers/BakerController.java | 22 ++++++++++++------- .../bakery/controllers/MuffinController.java | 22 +++++++++++++------ .../bakery/models/Baker.java | 7 +++++- .../bakery/models/Muffin.java | 8 +++++-- .../bakery/repositories/BakerRepository.java | 2 ++ .../bakery/repositories/MuffinRepository.java | 2 ++ .../bakery/services/BakerService.java | 4 ++++ .../bakery/services/MuffinService.java | 4 ++++ src/main/resources/application.properties | 1 + 9 files changed, 54 insertions(+), 18 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..c1dc449 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) { @@ -15,20 +21,20 @@ public BakerController(BakerService service) { public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - - public ResponseEntity show(Long id) { + @RequestMapping(value ="/bakers/{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - - public ResponseEntity create(Baker baker) { + @PostMapping(value = "/bakers") + public ResponseEntity create(@RequestBody Baker baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - - public ResponseEntity update(Long id, Baker baker) { + @PutMapping(value = "/bakers/{id}") + public ResponseEntity update(@PathVariable Long id,@RequestBody 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..f81f9d5 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -2,33 +2,41 @@ 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.*; +@Controller +@RequestMapping(value="/muffin-controller") public class MuffinController { + @Autowired private MuffinService service; public MuffinController(MuffinService service) { this.service = service; } + // @RequestMapping(value = "/muffins") public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - public ResponseEntity show(Long id) { + @GetMapping(value = "/muffins/{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - - public ResponseEntity create(Muffin baker) { + @PostMapping(value = "/muffins") + public ResponseEntity create(@RequestBody Muffin baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - - public ResponseEntity update(Long id, Muffin baker) { + @PutMapping(value = "/muffins/{id}") + public ResponseEntity update(@PathVariable Long id,@RequestBody Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - - public ResponseEntity destroy(Long 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 8e8c716..a0a9d2c 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.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import java.util.Objects; - +@Entity public class Baker { + @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 9b374a1..0026652 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.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import java.util.Objects; - +@Entity public class Muffin { - +@Id +@GeneratedValue 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..057a678 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.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service public class BakerService { + @Autowired 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..107f36a 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java @@ -2,8 +2,12 @@ import com.zipcodewilmington.bakery.models.Muffin; import com.zipcodewilmington.bakery.repositories.MuffinRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service public class MuffinService { + @Autowired private MuffinRepository repository; public MuffinService(MuffinRepository repository) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e69de29..a3ac65c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=8080 \ No newline at end of file From 1bf679b3162919d482e1bad69d25b20ecc8d5c50 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Sat, 14 Aug 2021 18:01:36 -0400 Subject: [PATCH 2/3] completed --- .../bakery/controllers/BakerController.java | 1 - .../bakery/controllers/MuffinController.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java index c1dc449..a81cdc5 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.*; @Controller - public class BakerController { @Autowired private BakerService service; diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java index f81f9d5..aa42ada 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -9,33 +9,33 @@ import org.springframework.web.bind.annotation.*; @Controller -@RequestMapping(value="/muffin-controller") public class MuffinController { - @Autowired - private MuffinService service; + private MuffinService service; + @Autowired public MuffinController(MuffinService service) { this.service = service; } - // @RequestMapping(value = "/muffins") + @RequestMapping(value = "/muffins") public ResponseEntity> index() { - return new ResponseEntity<>(service.index(), HttpStatus.OK); + return new ResponseEntity<>(service.index(), + HttpStatus.OK); } @GetMapping(value = "/muffins/{id}") public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - @PostMapping(value = "/muffins") + @PostMapping(value = "muffins") public ResponseEntity create(@RequestBody Muffin baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - @PutMapping(value = "/muffins/{id}") + @PutMapping(value = "muffins/{id}") public ResponseEntity update(@PathVariable Long id,@RequestBody Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - @DeleteMapping("/muffins/{id}") + @DeleteMapping("muffins/{id}") public ResponseEntity destroy(@PathVariable Long id) { return new ResponseEntity<>(service.delete(id), HttpStatus.OK); } From 1ef5f3a62322444d321667229ba8c595c09fa209 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Sat, 14 Aug 2021 18:27:14 -0400 Subject: [PATCH 3/3] completed lab --- .../zipcodewilmington/bakery/controllers/BakerController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java index a81cdc5..b3e3bed 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -10,9 +10,9 @@ @Controller public class BakerController { - @Autowired - private BakerService service; + private BakerService service; + @Autowired public BakerController(BakerService service) { this.service = service; }