Merge branch 'master' of https://git.zipcode.rocks/Cohort4.2/CR-MicroLabs-Annotations-Bakery

pom.xml

@@ -1,69 +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>
+        <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

@@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class BakerController {
-
-    @Autowired
     private BakerRepository bakerRepository;
 
     @GetMapping("/Baker")
@@ -18,9 +16,8 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
-    @GetMapping("/Baker/{id}")
-    public ResponseEntity<Baker> show(@PathVariable(value = "id") Long id) {
-        return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
+    public ResponseEntity<Baker> show(Long id) {
+        return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
     }
 
     @PostMapping("/Baker")
@@ -28,9 +25,8 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
-    @PutMapping("/Baker/{id}")
-    public ResponseEntity<Baker> update(@PathVariable(value = "id")Long id, Baker baker) {
-        Baker foundBaker = bakerRepository.findOne(id);
+    public ResponseEntity<Baker> update(Long id, Baker baker) {
+        Baker foundBaker = bakerRepository.findById(id).get();
 
         foundBaker.setName(baker.getName());
         foundBaker.setSpecialty(baker.getSpecialty());
@@ -38,9 +34,8 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
-    @DeleteMapping("/Baker/{id}")
-    public ResponseEntity<Boolean> destroy(@PathVariable(value = "id")Long id) {
-        this.bakerRepository.delete(id);
+    public ResponseEntity<Boolean> destroy(Long id) {
+        this.bakerRepository.findById(id).get();
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 }

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

@@ -19,9 +19,9 @@ public class MuffinController {
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
-    @GetMapping("/Baker/{id}")
-    public ResponseEntity<Muffin> show(@PathVariable(value = "id") Long id) {
-        return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
+
+    public ResponseEntity<Muffin> show(Long id) {
+        return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
     }
 
     @PostMapping("/Baker")
@@ -29,17 +29,15 @@ public class MuffinController {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
-    @PutMapping("/Baker/{id}")
-    public ResponseEntity<Muffin> update(@PathVariable(value = "id")Long id, Muffin muffin) {
-        Muffin foundMuffin = muffinRepository.findOne(id);
+    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
+        Muffin foundMuffin = muffinRepository.findById(id).get();
         foundMuffin.setFlavor(muffin.getFlavor());
 
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
-    @DeleteMapping("/Baker/{id}")
-    public ResponseEntity<Boolean> destroy(@PathVariable(value = "id")Long id) {
-        this.muffinRepository.delete(id);
+    public ResponseEntity<Boolean> destroy(Long id) {
+        this.muffinRepository.deleteById(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 

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

@@ -7,9 +7,6 @@ import javax.persistence.Id;
 
 @Entity
 public class Muffin {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     private String flavor;

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

@@ -2,7 +2,7 @@ package com.zipcodewilmington.bakery.Repositories;
 
 import com.zipcodewilmington.bakery.Models.Baker;
 import org.springframework.data.repository.CrudRepository;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Repository;
 
 @RestController
 public interface BakerRepository extends CrudRepository<Baker, Long> {

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

@@ -2,7 +2,7 @@ package com.zipcodewilmington.bakery.Repositories;
 
 import com.zipcodewilmington.bakery.Models.Muffin;
 import org.springframework.data.repository.CrudRepository;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Repository;
 
 @RestController
 public interface MuffinRepository extends CrudRepository<Muffin, Long> {