pom.xml

@@ -11,12 +11,12 @@
 	<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>1.5.11.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -25,6 +25,13 @@
 	</properties>
 
 	<dependencies>
+
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -50,7 +57,11 @@
 			<artifactId>spring-data-commons</artifactId>
 			<version>1.13.10.RELEASE</version>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+    </dependencies>
 
 	<build>
 		<plugins>

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

@@ -2,11 +2,22 @@ package com.zipcodewilmington.bakery;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
 
+@EntityScan
 @SpringBootApplication
 public class BakeryApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(BakeryApplication.class, args);
 	}
+
+//	@Bean
+//	ServletRegistrationBean h2servletRegistration(){
+//		ServletRegistrationBean registrationBean = new ServletRegistrationBean( new WebServlet());
+//		registrationBean.addUrlMappings("/console/*");
+//		return registrationBean;
+//	}
 }

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

@@ -2,25 +2,36 @@ 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.*;
 
+@RestController
 public class BakerController {
 
     private BakerRepository bakerRepository;
 
+    BakerController(@Autowired BakerRepository bakerRepository){
+        this.bakerRepository = bakerRepository;
+    }
+
+    @GetMapping("/baker")
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
     }
 
+    @GetMapping("/baker/{id}")
     public ResponseEntity<Baker> show(Long id) {
         return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
     }
 
+    @PostMapping("/baker")
     public ResponseEntity<Baker> create(Baker baker) {
         return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
     }
 
+    @RequestMapping(value = "/baker/{id}", method = RequestMethod.PUT)
     public ResponseEntity<Baker> update(Long id, Baker baker) {
         Baker foundBaker = bakerRepository.findOne(id);
 
@@ -30,7 +41,8 @@ public class BakerController {
         return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @DeleteMapping("/baker/{id}")
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         this.bakerRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }

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

@@ -2,25 +2,36 @@ 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.*;
 
+@RestController
 public class MuffinController {
 
     private MuffinRepository muffinRepository;
 
+    public MuffinController(@Autowired MuffinRepository muffinRepository) {
+        this.muffinRepository = muffinRepository;
+    }
+
+    @GetMapping("/muffin")
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
     }
 
+    @GetMapping("/muffin/{id}")
     public ResponseEntity<Muffin> show(Long id) {
         return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
     }
 
+    @PostMapping("/muffin")
     public ResponseEntity<Muffin> create(Muffin muffin) {
         return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
     }
 
+    @RequestMapping(value = "/muffin/{id}", method = RequestMethod.PUT)
     public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
         Muffin foundMuffin = muffinRepository.findOne(id);
         foundMuffin.setFlavor(muffin.getFlavor());
@@ -28,9 +39,10 @@ public class MuffinController {
         return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @DeleteMapping("/muffin/{id}")
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         this.muffinRepository.delete(id);
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
-
+//change
 }

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

@@ -1,6 +1,15 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
 public class Baker {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     private String name;

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

@@ -1,7 +1,15 @@
 package com.zipcodewilmington.bakery.Models;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+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,6 +2,9 @@ package com.zipcodewilmington.bakery.Repositories;
 
 import com.zipcodewilmington.bakery.Models.Baker;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
+//@Repository("beanBaker")
+@Repository("beanBaker")
 public interface BakerRepository extends CrudRepository<Baker, Long> {
 }

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

@@ -2,6 +2,8 @@ package com.zipcodewilmington.bakery.Repositories;
 
 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> {
 }

src/main/resources/application-h2.properties

@@ -0,0 +1,4 @@
+spring.datasource.url=jdbc:h2:mem:testdb;Mode=Oracle
+spring.datasource.platform=h2
+spring.jpa.hibernate.ddl-auto=none
+spring.datasource.continue-on-error=true

src/main/resources/application.properties

@@ -0,0 +1,2 @@
+spring.profiles.active=h2
+spring.jpa.database-platform=org.hibernate.dialect.Oracle10gDialect