possibly done?

pom.xml

@@ -48,7 +48,14 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
-			<version>1.13.10.RELEASE</version>
+		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
 		</dependency>
 	</dependencies>
 

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

@@ -2,27 +2,37 @@ 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.stereotype.Controller;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.*;
 
+@RestController
 public class BakerController {
 
+    @Autowired
     private 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) {
-        return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
+    @RequestMapping(value = "/bakers/id", method = RequestMethod.GET)
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
+        return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> create(Baker baker) {
+    @RequestMapping(value="/bakers", method= RequestMethod.POST)
+    public ResponseEntity<Baker> create(@PathVariable Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
-        Baker foundBaker = bakerRepository.findOne(id);
+    @RequestMapping(value="/bakers/id", method= RequestMethod.PUT)
+    public ResponseEntity<Baker> update(Long id, @PathVariable Baker baker) {
+        Baker foundBaker = bakerRepository.findById(id).get();
 
         foundBaker.setName(baker.getName());
         foundBaker.setSpecialty(baker.getSpecialty());
@@ -30,8 +40,9 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
+    @RequestMapping(value="/bakers/id", method= RequestMethod.DELETE)
     public ResponseEntity<Boolean> destroy(Long id) {
-        this.bakerRepository.delete(id);
+        this.bakerRepository.delete(bakerRepository.findById(id).get());
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 }

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

@@ -2,34 +2,44 @@ 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.*;
 
+@RestController
 public class MuffinController {
 
+    @Autowired
     private 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) {
-        return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
+    @RequestMapping(value = "/muffins/id", method=RequestMethod.GET)
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
+        return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> create(Muffin muffin) {
+    @RequestMapping(value = "/muffins", method = RequestMethod.POST)
+    public ResponseEntity<Muffin> create(@RequestBody Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
-        Muffin foundMuffin = muffinRepository.findOne(id);
+    @RequestMapping(value = "/muffin/id", method=RequestMethod.PUT)
+    public ResponseEntity<Muffin> update(@PathVariable Long id, @RequestBody Muffin muffin) {
+        Muffin foundMuffin = muffinRepository.findById(id).get();
         foundMuffin.setFlavor(muffin.getFlavor());
 
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
-        this.muffinRepository.delete(id);
+    @RequestMapping(value = "/muffins/id", method = RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
+        this.muffinRepository.delete(muffinRepository.findById(id).get());
         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;
@@ -9,6 +17,8 @@ public class Baker {
 
     private String specialty;
 
+    public Baker(){}
+
     public Baker(String name, String employeeId, String specialty) {
         this.name = name;
         this.employeeId = employeeId;

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

@@ -1,11 +1,21 @@
 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;
 
+    public Muffin(){}
+
     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> {
 }

src/main/resources/application.properties

@@ -0,0 +1 @@
+server.port=8081

src/test/java/com/zipcodewilmington/bakery/BakeryApplicationTests.java

@@ -1,16 +1,29 @@
 package com.zipcodewilmington.bakery;
 
+import com.zipcodewilmington.bakery.Controllers.BakerController;
+import com.zipcodewilmington.bakery.Controllers.MuffinController;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class BakeryApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//public class BakeryApplicationTests {
+//
+//	@Autowired
+//	private BakerController bakerController;
+//
+//	@Autowired
+//	private MuffinController muffinController;
+//
+//	@Test
+//	public void contextLoads() {
+//		Assert.assertNotNull(bakerController);
+//		Assert.assertNotNull(muffinController);
+//	}
+//
+//
+//}