From aa1f05c79a53375124064f80fc98f48c38cbf62a Mon Sep 17 00:00:00 2001 From: jeanvalentin51 Date: Thu, 5 Dec 2019 17:13:59 -0500 Subject: [PATCH 1/2] finished lab --- .../bakery/controllers/BakerController.java | 19 +++++++++++++++---- .../bakery/controllers/MuffinController.java | 19 +++++++++++++++---- .../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 | 4 ++++ 8 files changed, 56 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 b69065c..09992b5 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -2,33 +2,44 @@ 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("/bakers/") +@Controller public class BakerController { private BakerService service; + @Autowired public BakerController(BakerService service) { this.service = service; } + @GetMapping public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - public ResponseEntity show(Long id) { + @GetMapping("{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - public ResponseEntity create(Baker baker) { + @PostMapping + public ResponseEntity create(@RequestBody Baker baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - public ResponseEntity update(Long id, Baker baker) { + @PutMapping("{id}") + public ResponseEntity update(@RequestParam("id") Long id, Baker baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - public ResponseEntity destroy(Long id) { + @DeleteMapping("{id}") + public ResponseEntity destroy(@RequestParam("id") 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..996765d 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -2,33 +2,44 @@ 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("/muffins/") +@Controller public class MuffinController { private MuffinService service; + @Autowired public MuffinController(MuffinService service) { this.service = service; } + @GetMapping public ResponseEntity> index() { return new ResponseEntity<>(service.index(), HttpStatus.OK); } - public ResponseEntity show(Long id) { + @GetMapping("{id}") + public ResponseEntity show(@PathVariable Long id) { return new ResponseEntity<>(service.show(id), HttpStatus.OK); } - public ResponseEntity create(Muffin baker) { + @PostMapping + public ResponseEntity create(@RequestBody Muffin baker) { return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED); } - public ResponseEntity update(Long id, Muffin baker) { + @PutMapping("{id}") + public ResponseEntity update(@RequestParam("id") Long id, Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } - public ResponseEntity destroy(Long id) { + @DeleteMapping("{id}") + public ResponseEntity destroy(@RequestParam("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 8e8c716..79691d3 100644 --- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java +++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java @@ -1,9 +1,17 @@ package com.zipcodewilmington.bakery.models; +import org.springframework.stereotype.Controller; + +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..0e2f654 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.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..ac46973 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java @@ -2,10 +2,14 @@ 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 { private BakerRepository repository; + @Autowired public BakerService(BakerRepository repository) { this.repository = 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..f691352 100644 --- a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java +++ b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java @@ -2,10 +2,14 @@ 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 { private MuffinRepository repository; + @Autowired public MuffinService(MuffinRepository repository) { this.repository = repository; } From 3aafddfa0d1b24af8861fcf9386ff41fed989f3a Mon Sep 17 00:00:00 2001 From: jeanvalentin51 Date: Fri, 6 Dec 2019 08:30:46 -0500 Subject: [PATCH 2/2] fin --- .../zipcodewilmington/bakery/controllers/BakerController.java | 4 ++-- .../bakery/controllers/MuffinController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java index 09992b5..97da931 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java @@ -34,12 +34,12 @@ public ResponseEntity create(@RequestBody Baker baker) { } @PutMapping("{id}") - public ResponseEntity update(@RequestParam("id") Long id, Baker baker) { + public ResponseEntity update(@PathVariable Long id, Baker baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } @DeleteMapping("{id}") - public ResponseEntity destroy(@RequestParam("id") Long 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 996765d..22e7d5e 100644 --- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java +++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java @@ -34,12 +34,12 @@ public ResponseEntity create(@RequestBody Muffin baker) { } @PutMapping("{id}") - public ResponseEntity update(@RequestParam("id") Long id, Muffin baker) { + public ResponseEntity update(@PathVariable Long id, Muffin baker) { return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK); } @DeleteMapping("{id}") - public ResponseEntity destroy(@RequestParam("id") Long id) { + public ResponseEntity destroy(@PathVariable Long id) { return new ResponseEntity<>(service.delete(id), HttpStatus.OK); } }