{jaejoson Bakery lab}

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.4.RELEASE</version>
+        <version>1.5.11.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -25,6 +25,13 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

src/main/java/com/zipcodewilmington/bakery/Controllers/BakerController.java

@@ -2,26 +2,33 @@ package com.zipcodewilmington.bakery.Controllers;
 
 import com.zipcodewilmington.bakery.Models.Baker;
 import com.zipcodewilmington.bakery.Repositories.BakerRepository;
+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 {
+    @Autowired
     private BakerRepository bakerRepository;
 
+    @GetMapping("/index")
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
-
+    @GetMapping("/show")
     public ResponseEntity<Baker> show(Long id) {
-        return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
+        return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
 
+    @PostMapping("/create")
     public ResponseEntity<Baker> create(Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
+    @PutMapping("/update")
     public ResponseEntity<Baker> update(Long id, Baker baker) {
-        Baker foundBaker = bakerRepository.findById(id).get();
+        Baker foundBaker = bakerRepository.findOne(id);
 
         foundBaker.setName(baker.getName());
         foundBaker.setSpecialty(baker.getSpecialty());
@@ -29,8 +36,9 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
+    @DeleteMapping("/delete")
     public ResponseEntity<Boolean> destroy(Long id) {
-        this.bakerRepository.findById(id).get();
+        this.bakerRepository.findById(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 }

src/main/java/com/zipcodewilmington/bakery/Controllers/MuffinController.java

@@ -2,34 +2,38 @@ package com.zipcodewilmington.bakery.Controllers;
 
 import com.zipcodewilmington.bakery.Models.Muffin;
 import com.zipcodewilmington.bakery.Repositories.MuffinRepository;
+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 {
-
+    @Autowired
     private MuffinRepository muffinRepository;
 
+    @GetMapping("/muffin/index")
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
-
+    @GetMapping("muffin/showOne")
     public ResponseEntity<Muffin> show(Long id) {
-        return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
+        return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
-
+    @PostMapping("muffin/create")
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
-
+    @PutMapping("muffin/update")
     public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
-        Muffin foundMuffin = muffinRepository.findById(id).get();
+        Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
 
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
-
+    @DeleteMapping("muffin/delete")
     public ResponseEntity<Boolean> destroy(Long id) {
-        this.muffinRepository.deleteById(id);
+        this.muffinRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 

src/main/java/com/zipcodewilmington/bakery/Models/Baker.java

@@ -1,6 +1,14 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
 public class Baker {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     private String name;

src/main/java/com/zipcodewilmington/bakery/Models/Muffin.java

@@ -1,6 +1,14 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
 public class Muffin {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     private String flavor;

src/main/java/com/zipcodewilmington/bakery/Repositories/BakerRepository.java

@@ -4,5 +4,9 @@ import com.zipcodewilmington.bakery.Models.Baker;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+@Repository
 public interface BakerRepository extends CrudRepository<Baker, Long> {
+    List<Object> findById(Long id);
 }

src/main/java/com/zipcodewilmington/bakery/Repositories/MuffinRepository.java

@@ -4,5 +4,9 @@ import com.zipcodewilmington.bakery.Models.Muffin;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+@Repository
 public interface MuffinRepository extends CrudRepository<Muffin, Long> {
+
 }