commit 1

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>
 
@@ -26,6 +26,12 @@
 
 	<dependencies>
 		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
@@ -50,7 +56,13 @@
 			<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>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 	<build>
 		<plugins>

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

@@ -3,10 +3,15 @@ package com.zipcodewilmington.bakery;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
 @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,25 +2,44 @@ 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.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-
+import org.springframework.orm.jpa.JpaVendorAdapter;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+
+import javax.activation.DataSource;
+import javax.persistence.EntityManagerFactory;
+
+@Controller
 public class BakerController {
 
+    @Autowired
     private BakerRepository bakerRepository;
 
+
+    @GetMapping(path = "/baker")
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
+    @GetMapping(path = "/baker/{id}")
     public ResponseEntity<Baker> show(Long id) {
         return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
 
+    @PostMapping(path = "/baker")
     public ResponseEntity<Baker> create(Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
+    @PutMapping(path = "/baker")
     public ResponseEntity<Baker> update(Long id, Baker baker) {
         Baker foundBaker = bakerRepository.findOne(id);
 
@@ -30,6 +49,7 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
+    @DeleteMapping(path = "/baker")
     public ResponseEntity<Boolean> destroy(Long id) {
         this.bakerRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);

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

@@ -2,25 +2,41 @@ 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.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+@Controller
 public class MuffinController {
 
+    @Autowired
     private MuffinRepository muffinRepository;
 
+    @GetMapping(path = "/muffin")
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
 
+    @GetMapping(path = "/muffin/{id}")
     public ResponseEntity<Muffin> show(Long id) {
         return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
 
+    @PostMapping(path = "/muffin")
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
+    @PutMapping(path = "/muffin")
     public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
@@ -28,6 +44,7 @@ public class MuffinController {
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
+    @DeleteMapping(path = "/muffin")
     public ResponseEntity<Boolean> destroy(Long id) {
         this.muffinRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);

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

@@ -1,12 +1,23 @@
 package com.zipcodewilmington.bakery.Models;
 
+import org.springframework.data.annotation.Id;
+
+import javax.persistence.*;
+
+@Entity
 public class Baker {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
+    @Column
     private String name;
 
+    @Column
     private String employeeId;
 
+    @Column
     private String specialty;
 
     public Baker(String name, String employeeId, String specialty) {

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

@@ -1,11 +1,20 @@
 package com.zipcodewilmington.bakery.Models;
 
+import org.springframework.data.annotation.Id;
+
+import javax.persistence.*;
+
+@Entity
 public class Muffin {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
+    @Column
     private String flavor;
 
+
     public Muffin(String flavor) {
         this.flavor = 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> {
 }