bakery finished

pom.xml

@@ -1,65 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.zipcodewilmington</groupId>
-	<artifactId>bakery</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>com.zipcodewilmington</groupId>
+    <artifactId>bakery</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<name>bakery</name>
-	<description>Demo project for Spring Boot</description>
+    <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>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.4.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-rest</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-rest</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-commons</artifactId>
-			<version>1.13.10.RELEASE</version>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <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>
+            <version>2.0.4.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 
 </project>

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

@@ -2,25 +2,34 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController
 public class BakerController {
 
     private BakerRepository bakerRepository;
 
+    @Autowired
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/baker", method = RequestMethod.GET)
     public ResponseEntity<Baker> show(Long id) {
         return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/baker", method = RequestMethod.POST)
     public ResponseEntity<Baker> create(Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
+    @RequestMapping(value = "/baker/{bakerid}", method = RequestMethod.PUT)
     public ResponseEntity<Baker> update(Long id, Baker baker) {
         Baker foundBaker = bakerRepository.findOne(id);
 
@@ -30,6 +39,7 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/bakers/{bakerid}", method = RequestMethod.DELETE)
     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,33 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController
 public class MuffinController {
 
     private MuffinRepository muffinRepository;
 
+    @Autowired
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
-
+    @RequestMapping(value="/muffin", method= RequestMethod.GET)
     public ResponseEntity<Muffin> show(Long id) {
         return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/muffin", method = RequestMethod.POST)
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
+    @RequestMapping(value = "/muffin/{muffinid}", method = RequestMethod.POST)
     public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
@@ -28,6 +36,7 @@ public class MuffinController {
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/muffin/{muffinid}", method = RequestMethod.DELETE)
     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 javax.persistence.*;
+
+@Entity
 public class Baker {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "BAKER_ID")
     private Long id;
 
+    @Column(name = "BAKER_NAME")
     private String name;
 
+    @Column(name = "BAKER_NAME")
     private String employeeId;
 
+    @Column(name = "BAKER_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 = "MUFFIN_FLAVOR")
     private String flavor;
 
     public Muffin(String flavor) {