updated with the latest code

pom.xml

@@ -1,124 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
-<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>
-
-	<groupId>io.zipcoder</groupId>
-	<artifactId>spring-demo</artifactId>
-	<version>1.0-SNAPSHOT</version>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>8</source>
-					<target>8</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.3.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<start-class>com.zipcodewilmington.bakery.BakeryApplication</start-class>
-		<java.version>1.7</java.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<version>1</version>
-		</dependency>
-	</dependencies>
-=======
 <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>
-
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.1.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
     <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>
 
-    <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>
 
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-rest</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</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>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -130,7 +71,6 @@
             </plugin>
         </plugins>
     </build>
->>>>>>> 1356254de500f16124e3fe66a4b3ab488374a38d
 
 
 </project>

src/main/java/com/zipcodewilmington/bakery/BakeryApplication.java

@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class BakeryApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(BakeryApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(BakeryApplication.class, args);
+    }
 }

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

@@ -2,35 +2,48 @@ package com.zipcodewilmington.bakery.Controllers;
 
 import com.zipcodewilmington.bakery.Models.Baker;
 import com.zipcodewilmington.bakery.Repositories.BakerRepository;
+import com.zipcodewilmington.bakery.Services.BakerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController("baker")
 public class BakerController {
-    private BakerRepository bakerRepository;
 
+    @Autowired
+    private BakerService bakerService;
+
+    public BakerController(){
+    }
+
+    @RequestMapping(value = "/bakers", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Baker>> index() {
-        return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
+        return new ResponseEntity<>(this.bakerService.find(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> show(Long id) {
-        return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
+    @RequestMapping(value = "/bakers/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
+        return new ResponseEntity<>(this.bakerService.findById(id), HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/bakers", method = RequestMethod.POST)
     public ResponseEntity<Baker> create(Baker baker) {
-        return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
+        return new ResponseEntity<>(this.bakerService.create(baker), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Baker> update(Long id, 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);
+    @RequestMapping(value = "/bakers/{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Baker> update(@PathVariable Long id, Baker baker) {
+        return new ResponseEntity<>(this.bakerService.update(id,baker), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
-        this.bakerRepository.findById(id).get();
-        return new ResponseEntity<>(true, HttpStatus.OK);
+    @RequestMapping(value = "/bakers/{id}", method = RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
+        return new ResponseEntity<>(this.bakerService.destroy(id), HttpStatus.OK);
     }
 }

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

@@ -2,35 +2,51 @@ package com.zipcodewilmington.bakery.Controllers;
 
 import com.zipcodewilmington.bakery.Models.Muffin;
 import com.zipcodewilmington.bakery.Repositories.MuffinRepository;
+import com.zipcodewilmington.bakery.Services.MuffinService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController("muffin")
 public class MuffinController {
 
-    private MuffinRepository muffinRepository;
+    private MuffinService muffinService;
 
+    @Autowired
+    public MuffinController(MuffinService muffinService) {
+        this.muffinService = muffinService;
+    }
+
+    @RequestMapping(value = "/muffins", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Muffin>> index() {
-        return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
+        return new ResponseEntity<>(this.muffinService.find(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> show(Long id) {
-        return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
+    @RequestMapping(value = "/muffins/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
+        return new ResponseEntity<>(this.muffinService.findById(id), HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/muffins", method = RequestMethod.POST)
     public ResponseEntity<Muffin> create(Muffin muffin) {
-        return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
+        return new ResponseEntity<>(this.muffinService.create(muffin), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
-        Muffin foundMuffin = muffinRepository.findById(id).get();
-        foundMuffin.setFlavor(muffin.getFlavor());
+    @RequestMapping(value = "/muffins/{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Muffin> update(@PathVariable Long id, Muffin muffin) {
 
-        return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
+        return new ResponseEntity<>(this.muffinService.update(id, muffin), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
-        this.muffinRepository.deleteById(id);
-        return new ResponseEntity<>(true, HttpStatus.OK);
+    @RequestMapping(value = "/muffins/{id}", method = RequestMethod.DELETE)
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
+        return new ResponseEntity<>(this.muffinService.destroy(id), HttpStatus.OK);
     }
 
 }

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

@@ -0,0 +1,59 @@
+package com.zipcodewilmington.bakery.Models;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Baker {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+
+    private String employeeId;
+
+    private String specialty;
+
+    public Baker(){}
+
+    public Baker(String name, String employeeId, String specialty) {
+        this.name = name;
+        this.employeeId = employeeId;
+        this.specialty = specialty;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmployeeId() {
+        return employeeId;
+    }
+
+    public void setEmployeeId(String employeeId) {
+        this.employeeId = employeeId;
+    }
+
+    public String getSpecialty() {
+        return specialty;
+    }
+
+    public void setSpecialty(String specialty) {
+        this.specialty = specialty;
+    }
+}

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

@@ -1,10 +1,20 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
 public class Muffin {
+
+    @Id
+    @GeneratedValue
     private Long id;
 
     private String flavor;
 
+    public Muffin(){}
+
     public Muffin(String flavor) {
         this.flavor = flavor;
     }

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

@@ -4,5 +4,8 @@ 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> {
+//    Baker findOne(Long id);
+    void deleteById(Long id);
 }

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

@@ -4,5 +4,8 @@ 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> {
+//    Muffin findOne(Long id);
+    void deleteById(Long id);
 }

src/main/java/com/zipcodewilmington/bakery/Services/BakerService.java

@@ -0,0 +1,40 @@
+package com.zipcodewilmington.bakery.Services;
+
+import com.zipcodewilmington.bakery.Models.Baker;
+import com.zipcodewilmington.bakery.Repositories.BakerRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BakerService {
+    @Autowired
+    private BakerRepository bakerRepository;
+
+    public BakerService(){}
+
+    public Iterable<Baker> find() {
+        return this.bakerRepository.findAll();
+    }
+
+    public Baker findById(Long id) {
+        return this.bakerRepository.findById(id).orElse(null);
+    }
+
+    public Baker create(Baker baker) {
+        return this.bakerRepository.save(baker);
+    }
+
+    public Baker update(Long id, Baker baker) {
+        Baker foundBaker = bakerRepository.findById(id).orElse(null);
+
+        foundBaker.setName(baker.getName());
+        foundBaker.setSpecialty(baker.getSpecialty());
+
+        return this.bakerRepository.save(foundBaker);
+    }
+
+    public Boolean destroy(Long id) {
+        this.bakerRepository.deleteById(id);
+        return true;
+    }
+}

src/main/java/com/zipcodewilmington/bakery/Services/MuffinService.java

@@ -0,0 +1,42 @@
+package com.zipcodewilmington.bakery.Services;
+
+import com.zipcodewilmington.bakery.Models.Muffin;
+import com.zipcodewilmington.bakery.Repositories.MuffinRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MuffinService {
+
+    private MuffinRepository muffinRepository;
+
+    @Autowired
+    public MuffinService(MuffinRepository muffinRepository) {
+        this.muffinRepository = muffinRepository;
+    }
+
+    public Iterable<Muffin> find() {
+        return this.muffinRepository.findAll();
+    }
+
+    public Muffin findById(Long id) {
+        return this.muffinRepository.findById(id).orElse(null);
+    }
+
+    public Muffin create(Muffin muffin) {
+        return this.muffinRepository.save(muffin);
+    }
+
+    public Muffin update(Long id, Muffin muffin) {
+        Muffin foundMuffin = muffinRepository.findById(id).orElse(null);
+        assert foundMuffin != null;
+        foundMuffin.setFlavor(muffin.getFlavor());
+
+        return this.muffinRepository.save(muffin);
+    }
+
+    public Boolean destroy(Long id) {
+        this.muffinRepository.deleteById(id);
+        return true;
+    }
+}

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

@@ -9,8 +9,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest
 public class BakeryApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }