commited

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>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </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

@@ -6,42 +6,38 @@ 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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class BakerController {
 
-
     @Autowired
     private BakerRepository bakerRepository;
 
-
+    @RequestMapping (value="/baker", 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 = "/baker/{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 = "/baker", method = RequestMethod.POST)
+    public ResponseEntity<Baker> create(@RequestBody 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 = "/baker/{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Baker> update(@PathVariable  Long id, @RequestBody Baker baker) {
+        Baker foundBaker = bakerRepository.findById(id).get();
 
         foundBaker.setName(baker.getName());
         foundBaker.setSpecialty(baker.getSpecialty());
 
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
-
-    public ResponseEntity<Boolean> destroy(Long id) {
-        this.bakerRepository.delete(id);
+    @RequestMapping(value = "/baker{id}", method = RequestMethod.DELETE )
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
+       this.bakerRepository .delete (this.bakerRepository.findById(id).get());
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 }

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

@@ -6,8 +6,7 @@ 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.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class MuffinController {
@@ -15,27 +14,32 @@ public class MuffinController {
     @Autowired
     private MuffinRepository muffinRepository;
 
+
+    @RequestMapping(value="/muffin",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="/muffin/{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="/muffin",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="/muffin/{id}",method= RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
+        this.muffinRepository.delete (this.muffinRepository.findById(id).get()) ;
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 

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

@@ -1,14 +1,25 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.*;
+
+
+@Entity
 public class Baker {
-    private Long id;
 
+    @Id
+   @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column (name="id")
+    private Long id;
+    @Column(name="name")
     private String name;
-
+    @Column(name="employeeId")
     private String employeeId;
-
+    @Column (name="speciality")
     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,12 +1,24 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.*;
+
+@Entity
 public class Muffin {
 
+    @Id
+    @GeneratedValue (strategy = GenerationType.AUTO)
+
+    @Column(name="id")
     private Long id;
 
+    @Column(name="flavor")
     private String flavor;
 
+    public Muffin() {
+    }
+
     public Muffin(String flavor) {
+
         this.flavor = flavor;
     }
 

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

@@ -4,7 +4,10 @@ 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> {
 
+
 }

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

@@ -4,7 +4,10 @@ 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> {
 
+
 }

src/main/resources/application.properties

@@ -1 +1 @@
-server.port:8082
+server.port:8080