Completed

pom.xml

@@ -11,10 +11,11 @@
 	<name>bakery</name>
 	<description>Demo project for Spring Boot</description>
 
+
 	<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>
 
@@ -29,6 +30,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -50,7 +56,11 @@
 			<artifactId>spring-data-commons</artifactId>
 			<version>1.13.10.RELEASE</version>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+    </dependencies>
 
 	<build>
 		<plugins>

src/main/java/com/zipcodewilmington/bakery/BakeryApplication.java

@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class BakeryApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(BakeryApplication.class, args);
 	}

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

@@ -2,35 +2,49 @@ 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.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController
 public class BakerController {
 
-    private BakerRepository bakerRepository;
+    private final BakerRepository bakerRepository;
 
+    @Autowired
+    public BakerController(BakerRepository bakerRepository) {
+        this.bakerRepository = bakerRepository;
+    }
+
+    @RequestMapping(value="/bakers", method= RequestMethod.GET)
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> show(Long id) {
+    @RequestMapping(value="/bakers/{BAKER_ID}", method=RequestMethod.GET)
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
 
+    @RequestMapping(value="/bakers", method= RequestMethod.POST)
     public ResponseEntity<Baker> create(Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
+    @RequestMapping(value="/bakers/{BAKER_ID}", method=RequestMethod.PUT)
+    public ResponseEntity<Baker> update(@PathVariable Long id, Baker baker) {
         Baker foundBaker = bakerRepository.findOne(id);
-
         foundBaker.setName(baker.getName());
         foundBaker.setSpecialty(baker.getSpecialty());
-
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @RequestMapping(value="/bakers/{BAKER_ID}", method=RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         this.bakerRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }

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

@@ -2,33 +2,49 @@ 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.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController
 public class MuffinController {
 
-    private MuffinRepository muffinRepository;
+    private final MuffinRepository muffinRepository;
 
+    @Autowired
+    public MuffinController(MuffinRepository muffinRepository) {
+        this.muffinRepository = muffinRepository;
+    }
+
+    @RequestMapping(value="/muffins", method= RequestMethod.GET)
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> show(Long id) {
+    @RequestMapping(value="/muffins/{MUFFIN_ID}", method=RequestMethod.GET)
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
         return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
 
+    @RequestMapping(value="/muffins", method= RequestMethod.POST)
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
+    @RequestMapping(value="/muffin/{MUFFIN_ID}", method=RequestMethod.PUT)
+    public ResponseEntity<Muffin> update(@PathVariable Long id, Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
 
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @RequestMapping(value="/muffins/{MUFFIN_ID}", method=RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         this.muffinRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }

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

@@ -1,12 +1,25 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
 public class Baker {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "BAKER_ID")
     private Long id;
 
+    @Column(name = "NAME")
     private String name;
 
+    @Column(name = "EMPLOYEEID")
     private String employeeId;
 
+    @Column(name = "SPECIALTY")
     private String specialty;
 
     public Baker(String name, String employeeId, String specialty) {

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

@@ -1,9 +1,19 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
 public class Muffin {
 
+    @Id
+    @GeneratedValue
+    @Column(name = "MUFFIN_ID")
     private Long id;
 
+    @Column(name = "FLAVOR")
     private String flavor;
 
     public Muffin(String flavor) {

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

@@ -2,6 +2,8 @@ package com.zipcodewilmington.bakery.Repositories;
 
 import com.zipcodewilmington.bakery.Models.Baker;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface BakerRepository extends CrudRepository<Baker, Long> {
 }

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

@@ -2,6 +2,8 @@ package com.zipcodewilmington.bakery.Repositories;
 
 import com.zipcodewilmington.bakery.Models.Muffin;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface MuffinRepository extends CrudRepository<Muffin, Long> {
 }