#28 Finished

Avoinna
Skamath321 haluaa yhdistää 1 committia lähteestä Skamath321/CR-MicroLabs-Annotations-Bakery:master kohteeseen master

BIN
.DS_Store Näytä tiedosto


+ 8
- 1
pom.xml Näytä tiedosto

@@ -14,7 +14,7 @@
14 14
     <parent>
15 15
         <groupId>org.springframework.boot</groupId>
16 16
         <artifactId>spring-boot-starter-parent</artifactId>
17
-        <version>2.0.4.RELEASE</version>
17
+        <version>2.1.1.RELEASE</version>
18 18
         <relativePath/> <!-- lookup parent from repository -->
19 19
     </parent>
20 20
 
@@ -25,6 +25,13 @@
25 25
     </properties>
26 26
 
27 27
     <dependencies>
28
+
29
+        <dependency>
30
+            <groupId>org.hsqldb</groupId>
31
+            <artifactId>hsqldb</artifactId>
32
+            <scope>runtime</scope>
33
+        </dependency>
34
+
28 35
         <dependency>
29 36
             <groupId>org.springframework.boot</groupId>
30 37
             <artifactId>spring-boot-starter</artifactId>

+ 16
- 5
src/main/java/com/zipcodewilmington/bakery/Controllers/BakerController.java Näytä tiedosto

@@ -2,25 +2,36 @@ package com.zipcodewilmington.bakery.Controllers;
2 2
 
3 3
 import com.zipcodewilmington.bakery.Models.Baker;
4 4
 import com.zipcodewilmington.bakery.Repositories.BakerRepository;
5
+import org.springframework.beans.factory.annotation.Autowired;
5 6
 import org.springframework.http.HttpStatus;
6 7
 import org.springframework.http.ResponseEntity;
7 8
 
9
+import org.springframework.web.bind.annotation.*;
10
+
11
+import java.nio.file.Path;
12
+
13
+@RestController
8 14
 public class BakerController {
15
+
16
+    @Autowired
9 17
     private BakerRepository bakerRepository;
10 18
 
19
+    @GetMapping(path = "/bakers")
11 20
     public ResponseEntity<Iterable<Baker>> index() {
12 21
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
13 22
     }
14 23
 
15
-    public ResponseEntity<Baker> show(Long id) {
24
+    @GetMapping(path = "/bakers/{id}")
25
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
16 26
         return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
17 27
     }
18
-
28
+    @PostMapping(path = "/bakers")
19 29
     public ResponseEntity<Baker> create(Baker baker) {
20 30
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
21 31
     }
22 32
 
23
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
33
+    @PutMapping(path = "/bakers/{id}")
34
+    public ResponseEntity<Baker> update(@PathVariable Long id, Baker baker) {
24 35
         Baker foundBaker = bakerRepository.findById(id).get();
25 36
 
26 37
         foundBaker.setName(baker.getName());
@@ -28,8 +39,8 @@ public class BakerController {
28 39
 
29 40
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
30 41
     }
31
-
32
-    public ResponseEntity<Boolean> destroy(Long id) {
42
+    @DeleteMapping(path = "bakers/{id}")
43
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
33 44
         this.bakerRepository.findById(id).get();
34 45
         return new ResponseEntity<>(true, HttpStatus.OK);
35 46
     }

+ 14
- 9
src/main/java/com/zipcodewilmington/bakery/Controllers/MuffinController.java Näytä tiedosto

@@ -2,33 +2,38 @@ package com.zipcodewilmington.bakery.Controllers;
2 2
 
3 3
 import com.zipcodewilmington.bakery.Models.Muffin;
4 4
 import com.zipcodewilmington.bakery.Repositories.MuffinRepository;
5
-import org.springframework.http.HttpStatus;
6
-import org.springframework.http.ResponseEntity;
5
+import org.springframework.beans.factory.annotation.Autowired;
6
+import org.springframework.http.*;
7
+import org.springframework.stereotype.Controller;
8
+import org.springframework.web.bind.annotation.*;
7 9
 
10
+@Controller
8 11
 public class MuffinController {
9 12
 
13
+    @Autowired
10 14
     private MuffinRepository muffinRepository;
11 15
 
16
+    @GetMapping(path = "/muffins")
12 17
     public ResponseEntity<Iterable<Muffin>> index() {
13 18
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
14 19
     }
15
-
16
-    public ResponseEntity<Muffin> show(Long id) {
20
+    @GetMapping(path = "/muffins/{id}")
21
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
17 22
         return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
18 23
     }
19
-
24
+    @PostMapping(path = "/muffins")
20 25
     public ResponseEntity<Muffin> create(Muffin muffin) {
21 26
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
22 27
     }
23
-
24
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
28
+    @PutMapping(path = "/muffins/{id}")
29
+    public ResponseEntity<Muffin> update(@PathVariable Long id, Muffin muffin) {
25 30
         Muffin foundMuffin = muffinRepository.findById(id).get();
26 31
         foundMuffin.setFlavor(muffin.getFlavor());
27 32
 
28 33
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
29 34
     }
30
-
31
-    public ResponseEntity<Boolean> destroy(Long id) {
35
+    @DeleteMapping(path = "/muffins/{id}")
36
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
32 37
         this.muffinRepository.deleteById(id);
33 38
         return new ResponseEntity<>(true, HttpStatus.OK);
34 39
     }

+ 9
- 0
src/main/java/com/zipcodewilmington/bakery/Models/Baker.java Näytä tiedosto

@@ -1,6 +1,15 @@
1 1
 package com.zipcodewilmington.bakery.Models;
2 2
 
3
+import javax.persistence.Entity;
4
+import javax.persistence.GeneratedValue;
5
+import javax.persistence.GenerationType;
6
+import javax.persistence.Id;
7
+
8
+@Entity
3 9
 public class Baker {
10
+
11
+    @Id
12
+    @GeneratedValue(strategy = GenerationType.AUTO)
4 13
     private Long id;
5 14
 
6 15
     private String name;

+ 9
- 0
src/main/java/com/zipcodewilmington/bakery/Models/Muffin.java Näytä tiedosto

@@ -1,6 +1,15 @@
1 1
 package com.zipcodewilmington.bakery.Models;
2 2
 
3
+
4
+
5
+import javax.persistence.*;
6
+
7
+
8
+@Entity
3 9
 public class Muffin {
10
+
11
+    @Id
12
+    @GeneratedValue(strategy = GenerationType.AUTO)
4 13
     private Long id;
5 14
 
6 15
     private String flavor;

+ 3
- 0
src/main/java/com/zipcodewilmington/bakery/Repositories/BakerRepository.java Näytä tiedosto

@@ -2,7 +2,10 @@ package com.zipcodewilmington.bakery.Repositories;
2 2
 
3 3
 import com.zipcodewilmington.bakery.Models.Baker;
4 4
 import org.springframework.data.repository.CrudRepository;
5
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
5 6
 import org.springframework.stereotype.Repository;
6 7
 
8
+@Repository
9
+@RepositoryRestResource(collectionResourceRel = "bakers", path = "bakers")
7 10
 public interface BakerRepository extends CrudRepository<Baker, Long> {
8 11
 }

+ 4
- 0
src/main/java/com/zipcodewilmington/bakery/Repositories/MuffinRepository.java Näytä tiedosto

@@ -2,7 +2,11 @@ package com.zipcodewilmington.bakery.Repositories;
2 2
 
3 3
 import com.zipcodewilmington.bakery.Models.Muffin;
4 4
 import org.springframework.data.repository.CrudRepository;
5
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
5 6
 import org.springframework.stereotype.Repository;
6 7
 
8
+
9
+@Repository
10
+@RepositoryRestResource(collectionResourceRel = "muffins", path = "muffins")
7 11
 public interface MuffinRepository extends CrudRepository<Muffin, Long> {
8 12
 }