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

pom.xml

@@ -1,4 +1,5 @@
 <?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">
@@ -56,6 +57,80 @@
 			<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>
+
+    <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>
+        <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-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>
+        </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>
+>>>>>>> 1356254de500f16124e3fe66a4b3ab488374a38d
 
 
 </project>

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

@@ -0,0 +1,36 @@
+package com.zipcodewilmington.bakery.Controllers;
+
+import com.zipcodewilmington.bakery.Models.Baker;
+import com.zipcodewilmington.bakery.Repositories.BakerRepository;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+public class BakerController {
+    private BakerRepository bakerRepository;
+
+    public ResponseEntity<Iterable<Baker>> index() {
+        return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Baker> show(Long id) {
+        return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Baker> create(Baker baker) {
+        return new ResponseEntity<>(this.bakerRepository.save(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);
+    }
+
+    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

@@ -0,0 +1,36 @@
+package com.zipcodewilmington.bakery.Controllers;
+
+import com.zipcodewilmington.bakery.Models.Muffin;
+import com.zipcodewilmington.bakery.Repositories.MuffinRepository;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+public class MuffinController {
+
+    private MuffinRepository muffinRepository;
+
+    public ResponseEntity<Iterable<Muffin>> index() {
+        return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Muffin> show(Long id) {
+        return new ResponseEntity<>(this.muffinRepository.findById(id).get(), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Muffin> create(Muffin muffin) {
+        return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
+    }
+
+    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);
+    }
+
+    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

@@ -0,0 +1,27 @@
+package com.zipcodewilmington.bakery.Models;
+
+public class Muffin {
+    private Long id;
+
+    private String flavor;
+
+    public Muffin(String flavor) {
+        this.flavor = flavor;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFlavor() {
+        return flavor;
+    }
+
+    public void setFlavor(String flavor) {
+        this.flavor = flavor;
+    }
+}

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

@@ -0,0 +1,8 @@
+package com.zipcodewilmington.bakery.Repositories;
+
+import com.zipcodewilmington.bakery.Models.Baker;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+public interface BakerRepository extends CrudRepository<Baker, Long> {
+}

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

@@ -0,0 +1,8 @@
+package com.zipcodewilmington.bakery.Repositories;
+
+import com.zipcodewilmington.bakery.Models.Muffin;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+public interface MuffinRepository extends CrudRepository<Muffin, Long> {
+}