part 2 done

README.md

@@ -4,26 +4,26 @@ This repository provides a starter project for a CRUD application using Spring B
 
 ## Exercise
 
-Using this project as a starter, you will create a Person class as an entity to persist to H2 with an autogenerated id, and provide access to CRUD operations on those entities using a Spring Rest Controller supporting `GET`, `PUT`, `POST`, and `DELETE` operations. Spring Boot will handle the actual HTTP traffic and database components for you, you just need to build the last few pieces of the puzzle described in this lab.
+Using this project as a starter, you will create a Model.Person class as an entity to persist to H2 with an autogenerated id, and provide access to CRUD operations on those entities using a Spring Rest Controller supporting `GET`, `PUT`, `POST`, and `DELETE` operations. Spring Boot will handle the actual HTTP traffic and database components for you, you just need to build the last few pieces of the puzzle described in this lab.
 
 As you are working on this lab, you can demo the behavior of your `GET` endpoints using your browser. For `PUT`, `POST`, and `DELETE` you will need a more robust tool, such as [Postman](https://www.getpostman.com/) or [curl](https://curl.haxx.se/).
 
 ### Part 1:
 
-Create a `Person` class with fields for first name, last name, and an id number.
+Create a `Model.Person` class with fields for first name, last name, and an id number.
 
-Create a `PersonController` class with `Person createPerson(Person p)`, `Person getPerson(int id)`, `List<Person> getPersonList()`, `Person updatePerson(Person p)`, and `void DeletePerson(int id)` methods, and let it track a list of Person objects.
+Create a `PersonController` class with `Model.Person createPerson(Model.Person p)`, `Model.Person getPerson(int id)`, `List<Model.Person> getPersonList()`, `Model.Person updatePerson(Model.Person p)`, and `void DeletePerson(int id)` methods, and let it track a list of Model.Person objects.
 
-Add the `@RestController` annotation to your `PersonController` class, and using the "Endpoints" list in the Reference section below, add the appropriate `@RequestMapping` annotations to each of your methods. Endpoints should be at `/people` and `/people/{id}` as appropriate. You will have to use `@PathVariable` for id numbers in the URI and `@RequestBody` for Person objects sent in the requests.
+Add the `@RestController` annotation to your `PersonController` class, and using the "Endpoints" list in the Reference section below, add the appropriate `@RequestMapping` annotations to each of your methods. Endpoints should be at `/people` and `/people/{id}` as appropriate. You will have to use `@PathVariable` for id numbers in the URI and `@RequestBody` for Model.Person objects sent in the requests.
 
 
 ### Part 2: 
 
-Add the `@Entity` and `@Id` annotations to your Person class as shown in the Reference section. These tell Spring how to convert your Person objects to database entities when you pass them to a repository.
+Add the `@Entity` and `@Id` annotations to your Model.Person class as shown in the Reference section. These tell Spring how to convert your Model.Person objects to database entities when you pass them to a repository.
 
-Create a `PersonRepository` interface that extends the `CrudRepository` interface. Be sure to specify the `Person` type parameter on `CrudRepository<>`. You will not need to implement this interface as Spring automatically generates an implementation at runtime.
+Create a `PersonRepository` interface that extends the `CrudRepository` interface. Be sure to specify the `Model.Person` type parameter on `CrudRepository<>`. You will not need to implement this interface as Spring automatically generates an implementation at runtime.
 
-Update your controller logic to use the `PersonRepository` instead of manually tracking Person objects in a list. You will need a `PersonRepository` field marked with the `@Autowired` annotation -- again, Spring will provide an implementation here automatically. You will need to use the `findAll()`, `findOne(id)`, `save(Person)` and `delete(id)` methods of `PersonRepository` to fetch and save Person objects.
+Update your controller logic to use the `PersonRepository` instead of manually tracking Model.Person objects in a list. You will need a `PersonRepository` field marked with the `@Autowired` annotation -- again, Spring will provide an implementation here automatically. You will need to use the `findAll()`, `findOne(id)`, `save(Model.Person)` and `delete(id)` methods of `PersonRepository` to fetch and save Model.Person objects.
 
 ### Part 3:
 
@@ -46,11 +46,11 @@ Now that your CRUD application is working, it's time to make sure the correct HT
 - `DELETE /people/{id}` - delete the person with id number `{id}`
   - Response: `204 No Content`
 
-**Person class and  ID configuration for H2**:
+**Model.Person class and  ID configuration for H2**:
 
 ```Java
 @Entity
-public class Person {
+public class Model.Person {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)

src/main/java/Controllers/PersonController.java

@@ -0,0 +1,62 @@
+package Controllers;
+
+import Model.Person;
+import Repository.PersonRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class PersonController {
+
+    private final PersonRepository personRepository;
+    @Autowired
+    public PersonController(PersonRepository personRepository) {
+        this.personRepository = personRepository;
+    }
+
+    @RequestMapping(value = "/person",method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Person>> getPersonList(){
+        Iterable<Person> listOfPeople = personRepository.findAll();
+        return new ResponseEntity<>(listOfPeople, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/person",method = RequestMethod.POST)
+    public ResponseEntity<Person> createPerson(@RequestBody Person p){
+        return new ResponseEntity<>(this.personRepository.save(p),HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value = "/person/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Person> getPerson(@PathVariable Long id){
+
+        if(this.personRepository.exists(id)){
+            return new ResponseEntity<>(this.personRepository.findOne(id), HttpStatus.OK);
+        }else{
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+    }
+
+    @RequestMapping(value = "/person/{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Person> updatePerson(@PathVariable Long id,@RequestBody Person p){
+
+        if(!this.personRepository.exists(id)){
+            return new ResponseEntity<>(this.personRepository.findOne(id), HttpStatus.OK);
+
+        }else{
+            Person people = personRepository.save(p);
+            people.setFirstName(p.getFirstName());
+            people.setLastName(p.getLastName());
+            return new ResponseEntity<>(this.personRepository.findOne(id),HttpStatus.OK);
+
+        }
+
+    }
+
+    @RequestMapping(value = "/person/{id}",method = RequestMethod.DELETE)
+    public void DeletePerson(@PathVariable Long id) {
+    }
+
+}

src/main/java/Model/Person.java

@@ -0,0 +1,37 @@
+package Model;
+
+import javax.persistence.*;
+
+@Entity
+public class Person {
+
+    @Id
+    @GeneratedValue
+    Long id;
+    String firstName;
+    String lastName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+}

src/main/java/Repository/PersonRepository.java

@@ -0,0 +1,9 @@
+package Repository;
+
+import Model.Person;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.CrudRepository;
+
+
+public interface PersonRepository extends CrudRepository <Person,Long> {
+}

src/main/resources/static/Requests.html

@@ -31,11 +31,11 @@
       </section>
       <section>
         <h2>GET person by id</h2>
-        <label for="getPersonId">Person ID:</label><input type="number" name="getPersonId" value="1" id="getPersonId"><br>
+        <label for="getPersonId">Model.Person ID:</label><input type="number" name="getPersonId" value="1" id="getPersonId"><br>
         <button type="button" name="submitGet" onclick="getPerson()">Submit GET</button>
       </section>
       <section>
-        <h2>POST new Person:</h2>
+        <h2>POST new Model.Person:</h2>
 
         <label for="firstName">First Name:</label><input type="text" name="firstName" value="foo" id="postPersonFirstName"><br>
         <label for="lastName">Last Name:</label><input type="text" name="lastName" value="bar" id="postPersonLastName"><br>
@@ -52,7 +52,7 @@
 
       <section>
         <h2>DELETE person by ID</h2>
-        <label for="delPersonId">Person ID:</label><input type="number" name="delPersonId" value="1" id="deletePersonId"><br>
+        <label for="delPersonId">Model.Person ID:</label><input type="number" name="delPersonId" value="1" id="deletePersonId"><br>
         <button type="button" name="submitDelete" onclick="deletePerson()">Submit DELETE</button>
       </section>
     </section>