Parcourir la source

changes to updated files

Trinh Tong il y a 6 ans
Parent
révision
f02153eaaf

BIN
.DS_Store Voir le fichier


+ 60
- 52
pom.xml Voir le fichier

@@ -1,65 +1,73 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
-	<modelVersion>4.0.0</modelVersion>
3
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
+    <modelVersion>4.0.0</modelVersion>
5 5
 
6
-	<groupId>com.zipcodewilmington</groupId>
7
-	<artifactId>bakery</artifactId>
8
-	<version>0.0.1-SNAPSHOT</version>
9
-	<packaging>jar</packaging>
6
+    <groupId>com.example</groupId>
7
+    <artifactId>bakerylab</artifactId>
8
+    <version>0.0.1-SNAPSHOT</version>
9
+    <packaging>jar</packaging>
10 10
 
11
-	<name>bakery</name>
12
-	<description>Demo project for Spring Boot</description>
11
+    <name>bakerylab</name>
12
+    <description>Demo project for Spring Boot</description>
13 13
 
14
-	<parent>
15
-		<groupId>org.springframework.boot</groupId>
16
-		<artifactId>spring-boot-starter-parent</artifactId>
17
-		<version>2.0.4.RELEASE</version>
18
-		<relativePath/> <!-- lookup parent from repository -->
19
-	</parent>
14
+    <parent>
15
+        <groupId>org.springframework.boot</groupId>
16
+        <artifactId>spring-boot-starter-parent</artifactId>
17
+        <version>2.1.1.RELEASE</version>
18
+        <relativePath/> <!-- lookup parent from repository -->
19
+    </parent>
20 20
 
21
-	<properties>
22
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24
-		<java.version>1.8</java.version>
25
-	</properties>
21
+    <properties>
22
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24
+        <java.version>1.8</java.version>
25
+    </properties>
26 26
 
27
-	<dependencies>
28
-		<dependency>
29
-			<groupId>org.springframework.boot</groupId>
30
-			<artifactId>spring-boot-starter</artifactId>
31
-		</dependency>
27
+    <dependencies>
28
+        <dependency>
29
+            <groupId>org.springframework.boot</groupId>
30
+            <artifactId>spring-boot-starter-web</artifactId>
31
+        </dependency>
32
+        <dependency>
33
+            <groupId>org.hsqldb</groupId>
34
+            <artifactId>hsqldb</artifactId>
35
+            <scope>runtime</scope>
36
+        </dependency>
32 37
 
33
-		<dependency>
34
-			<groupId>org.springframework.boot</groupId>
35
-			<artifactId>spring-boot-starter-data-rest</artifactId>
36
-		</dependency>
38
+        <dependency>
39
+            <groupId>javax.inject</groupId>
40
+            <artifactId>javax.inject</artifactId>
41
+            <version>1</version>
42
+        </dependency>
43
+        <dependency>
44
+            <groupId>org.springframework.boot</groupId>
45
+            <artifactId>spring-boot-devtools</artifactId>
46
+            <scope>runtime</scope>
47
+        </dependency>
48
+        <dependency>
49
+            <groupId>org.springframework.boot</groupId>
50
+            <artifactId>spring-boot-starter-test</artifactId>
51
+            <scope>test</scope>
52
+        </dependency>
53
+        <dependency>
54
+            <groupId>org.springframework.boot</groupId>
55
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
56
+        </dependency>
57
+    </dependencies>
58
+    Jump
59
+    Message Input
37 60
 
38
-		<dependency>
39
-			<groupId>org.springframework.boot</groupId>
40
-			<artifactId>spring-boot-starter-web</artifactId>
41
-		</dependency>
61
+    Message Lauren Green, Seth Abrams
42 62
 
43
-		<dependency>
44
-			<groupId>org.springframework.boot</groupId>
45
-			<artifactId>spring-boot-starter-test</artifactId>
46
-			<scope>test</scope>
47
-		</dependency>
48
-		<dependency>
49
-			<groupId>org.springframework.data</groupId>
50
-			<artifactId>spring-data-commons</artifactId>
51
-			<version>1.13.10.RELEASE</version>
52
-		</dependency>
53
-	</dependencies>
54
-
55
-	<build>
56
-		<plugins>
57
-			<plugin>
58
-				<groupId>org.springframework.boot</groupId>
59
-				<artifactId>spring-boot-maven-plugin</artifactId>
60
-			</plugin>
61
-		</plugins>
62
-	</build>
63
+    <build>
64
+        <plugins>
65
+            <plugin>
66
+                <groupId>org.springframework.boot</groupId>
67
+                <artifactId>spring-boot-maven-plugin</artifactId>
68
+            </plugin>
69
+        </plugins>
70
+    </build>
63 71
 
64 72
 
65 73
 </project>

+ 0
- 12
src/main/java/com/zipcodewilmington/bakery/BakeryApplication.java Voir le fichier

@@ -1,12 +0,0 @@
1
-package com.zipcodewilmington.bakery;
2
-
3
-import org.springframework.boot.SpringApplication;
4
-import org.springframework.boot.autoconfigure.SpringBootApplication;
5
-
6
-@SpringBootApplication
7
-public class BakeryApplication {
8
-
9
-	public static void main(String[] args) {
10
-		SpringApplication.run(BakeryApplication.class, args);
11
-	}
12
-}

+ 0
- 37
src/main/java/com/zipcodewilmington/bakery/Controllers/BakerController.java Voir le fichier

@@ -1,37 +0,0 @@
1
-package com.zipcodewilmington.bakery.Controllers;
2
-
3
-import com.zipcodewilmington.bakery.Models.Baker;
4
-import com.zipcodewilmington.bakery.Repositories.BakerRepository;
5
-import org.springframework.http.HttpStatus;
6
-import org.springframework.http.ResponseEntity;
7
-
8
-public class BakerController {
9
-
10
-    private BakerRepository bakerRepository;
11
-
12
-    public ResponseEntity<Iterable<Baker>> index() {
13
-        return new ResponseEntity<>(this.bakerRepository.findAll(), HttpStatus.OK);
14
-    }
15
-
16
-    public ResponseEntity<Baker> show(Long id) {
17
-        return new ResponseEntity<>(this.bakerRepository.findOne(id), HttpStatus.OK);
18
-    }
19
-
20
-    public ResponseEntity<Baker> create(Baker baker) {
21
-        return new ResponseEntity<>(this.bakerRepository.save(baker), HttpStatus.CREATED);
22
-    }
23
-
24
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
25
-        Baker foundBaker = bakerRepository.findOne(id);
26
-
27
-        foundBaker.setName(baker.getName());
28
-        foundBaker.setSpecialty(baker.getSpecialty());
29
-
30
-        return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
31
-    }
32
-
33
-    public ResponseEntity<Boolean> destroy(Long id) {
34
-        this.bakerRepository.delete(id);
35
-        return new ResponseEntity<>(true, HttpStatus.OK);
36
-    }
37
-}

+ 0
- 36
src/main/java/com/zipcodewilmington/bakery/Controllers/MuffinController.java Voir le fichier

@@ -1,36 +0,0 @@
1
-package com.zipcodewilmington.bakery.Controllers;
2
-
3
-import com.zipcodewilmington.bakery.Models.Muffin;
4
-import com.zipcodewilmington.bakery.Repositories.MuffinRepository;
5
-import org.springframework.http.HttpStatus;
6
-import org.springframework.http.ResponseEntity;
7
-
8
-public class MuffinController {
9
-
10
-    private MuffinRepository muffinRepository;
11
-
12
-    public ResponseEntity<Iterable<Muffin>> index() {
13
-        return new ResponseEntity<>(this.muffinRepository.findAll(), HttpStatus.OK);
14
-    }
15
-
16
-    public ResponseEntity<Muffin> show(Long id) {
17
-        return new ResponseEntity<>(this.muffinRepository.findOne(id), HttpStatus.OK);
18
-    }
19
-
20
-    public ResponseEntity<Muffin> create(Muffin muffin) {
21
-        return new ResponseEntity<>(this.muffinRepository.save(muffin), HttpStatus.CREATED);
22
-    }
23
-
24
-    public ResponseEntity<Muffin> update(Long id, Muffin muffin) {
25
-        Muffin foundMuffin = muffinRepository.findOne(id);
26
-        foundMuffin.setFlavor(muffin.getFlavor());
27
-
28
-        return new ResponseEntity<>(this.muffinRepository.save(foundMuffin), HttpStatus.OK);
29
-    }
30
-
31
-    public ResponseEntity<Boolean> destroy(Long id) {
32
-        this.muffinRepository.delete(id);
33
-        return new ResponseEntity<>(true, HttpStatus.OK);
34
-    }
35
-
36
-}

+ 0
- 49
src/main/java/com/zipcodewilmington/bakery/Models/Baker.java Voir le fichier

@@ -1,49 +0,0 @@
1
-package com.zipcodewilmington.bakery.Models;
2
-
3
-public class Baker {
4
-    private Long id;
5
-
6
-    private String name;
7
-
8
-    private String employeeId;
9
-
10
-    private String specialty;
11
-
12
-    public Baker(String name, String employeeId, String specialty) {
13
-        this.name = name;
14
-        this.employeeId = employeeId;
15
-        this.specialty = specialty;
16
-    }
17
-
18
-    public Long getId() {
19
-        return id;
20
-    }
21
-
22
-    public void setId(Long id) {
23
-        this.id = id;
24
-    }
25
-
26
-    public String getName() {
27
-        return name;
28
-    }
29
-
30
-    public void setName(String name) {
31
-        this.name = name;
32
-    }
33
-
34
-    public String getEmployeeId() {
35
-        return employeeId;
36
-    }
37
-
38
-    public void setEmployeeId(String employeeId) {
39
-        this.employeeId = employeeId;
40
-    }
41
-
42
-    public String getSpecialty() {
43
-        return specialty;
44
-    }
45
-
46
-    public void setSpecialty(String specialty) {
47
-        this.specialty = specialty;
48
-    }
49
-}

+ 0
- 28
src/main/java/com/zipcodewilmington/bakery/Models/Muffin.java Voir le fichier

@@ -1,28 +0,0 @@
1
-package com.zipcodewilmington.bakery.Models;
2
-
3
-public class Muffin {
4
-
5
-    private Long id;
6
-
7
-    private String flavor;
8
-
9
-    public Muffin(String flavor) {
10
-        this.flavor = flavor;
11
-    }
12
-
13
-    public Long getId() {
14
-        return id;
15
-    }
16
-
17
-    public void setId(Long id) {
18
-        this.id = id;
19
-    }
20
-
21
-    public String getFlavor() {
22
-        return flavor;
23
-    }
24
-
25
-    public void setFlavor(String flavor) {
26
-        this.flavor = flavor;
27
-    }
28
-}

+ 0
- 7
src/main/java/com/zipcodewilmington/bakery/Repositories/BakerRepository.java Voir le fichier

@@ -1,7 +0,0 @@
1
-package com.zipcodewilmington.bakery.Repositories;
2
-
3
-import com.zipcodewilmington.bakery.Models.Baker;
4
-import org.springframework.data.repository.CrudRepository;
5
-
6
-public interface BakerRepository extends CrudRepository<Baker, Long> {
7
-}

+ 0
- 7
src/main/java/com/zipcodewilmington/bakery/Repositories/MuffinRepository.java Voir le fichier

@@ -1,7 +0,0 @@
1
-package com.zipcodewilmington.bakery.Repositories;
2
-
3
-import com.zipcodewilmington.bakery.Models.Muffin;
4
-import org.springframework.data.repository.CrudRepository;
5
-
6
-public interface MuffinRepository extends CrudRepository<Muffin, Long> {
7
-}

+ 0
- 16
src/test/java/com/zipcodewilmington/bakery/BakeryApplicationTests.java Voir le fichier

@@ -1,16 +0,0 @@
1
-package com.zipcodewilmington.bakery;
2
-
3
-import org.junit.Test;
4
-import org.junit.runner.RunWith;
5
-import org.springframework.boot.test.context.SpringBootTest;
6
-import org.springframework.test.context.junit4.SpringRunner;
7
-
8
-@RunWith(SpringRunner.class)
9
-@SpringBootTest
10
-public class BakeryApplicationTests {
11
-
12
-	@Test
13
-	public void contextLoads() {
14
-	}
15
-
16
-}