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

pom.xml

@@ -1,76 +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>1.5.11.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.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <scope>runtime</scope>
+            <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>
-            <version>RELEASE</version>
-            <scope>compile</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>
+</project>

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class BakerController {
 
-    private final BakerRepository bakerRepository;
+    private BakerRepository bakerRepository;
 
     @Autowired
     public BakerController(BakerRepository bakerRepository) {
@@ -27,7 +27,7 @@ public class BakerController {
 
     @RequestMapping(value = "/bakers/{id}", method = RequestMethod.GET)
     public ResponseEntity<Baker> show(@PathVariable Long id) {
-        return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
+        return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
     }
 
     @RequestMapping(value = "/bakers", method = RequestMethod.POST)
@@ -37,8 +37,7 @@ public class BakerController {
 
     @RequestMapping(value = "/bakers/{id}", method = RequestMethod.PUT)
     public ResponseEntity<Baker> update(@PathVariable Long id, Baker baker) {
-        Baker foundBaker = bakerRepository.findOne(id);
-
+        Baker foundBaker = bakerRepository.findById(id).get();
         foundBaker.setName(baker.getName());
         foundBaker.setSpecialty(baker.getSpecialty());
 
@@ -47,7 +46,7 @@ public class BakerController {
 
     @RequestMapping(value = "/bakers/{id}", method = RequestMethod.DELETE)
     public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
-        this.bakerRepository.delete(id);
+        this.bakerRepository.findById(id).get();
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
 }

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

@@ -27,8 +27,8 @@ public class MuffinController {
     }
 
     @RequestMapping(value = "/muffins/{id}", method = RequestMethod.GET)
-    public ResponseEntity<Muffin> show(@PathVariable 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);
     }
 
     @RequestMapping(value = "/muffins", method = RequestMethod.POST)
@@ -38,7 +38,7 @@ public class MuffinController {
 
     @RequestMapping(value = "/muffins/{id}", method = RequestMethod.PUT)
     public ResponseEntity<Muffin> update(@PathVariable Long id, Muffin muffin) {
-        Muffin foundMuffin = muffinRepository.findOne(id);
+        Muffin foundMuffin = muffinRepository.findById(id).get();
         foundMuffin.setFlavor(muffin.getFlavor());
 
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
@@ -46,7 +46,7 @@ public class MuffinController {
 
     @RequestMapping(value = "/muffins/{id}", method = RequestMethod.DELETE)
     public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
-        this.muffinRepository.delete(id);
+        this.muffinRepository.deleteById(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }