[spring-http-client-1] ivy.lee(이다예) 과제 제출합니다.

spring-http-client-1/initial/src/main/java/cholog/Todo.java

@@ -3,8 +3,38 @@
 public class Todo {
 
     // TODO: Todo 객체가 가지는 필드들을 정의
+    private Long userId;
+    private Long id;
+    private String title;
+    private Boolean completed;
 
+    public Long getUserId() {
+        return userId;
+    }
+    public Long getId() {
+        return id;
+    }
     public String getTitle() {
-        return null;
+        return title;
+    }
+    public Boolean getCompleted() {
+        return completed;
+    }
+
+    // Setters
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setCompleted(Boolean completed) {
+        this.completed = completed;
     }
 }

spring-http-client-1/initial/src/main/java/cholog/TodoClientWithRestClient.java

@@ -1,7 +1,9 @@
 package cholog;
 
+import org.springframework.http.HttpStatusCode;
 import org.springframework.web.client.RestClient;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -13,13 +15,24 @@ public TodoClientWithRestClient(RestClient restClient) {
     }
 
     public List<Todo> getTodos() {
-        // TODO: restClient의 get 메서드를 사용하여 요청을 보내고 결과를 Todo 리스트로 변환하여 반환
-        return Collections.emptyList();
+        Todo[] result = restClient.get()
+                .uri("http://jsonplaceholder.typicode.com/todos")
+                .retrieve()
+                .body(Todo[].class);
+
+        return Arrays.asList(result);
     }
 
     public Todo getTodoById(Long id) {
-        // TODO: restClient의 get 메서드를 사용하여 요청을 보내고 결과를 Todo로 변환하여 반환
-        // TODO: 존재하지 않는 id로 요청을 보낼 경우 TodoException.NotFound 예외를 던짐
-        return new Todo();
+
+        Todo result = restClient.get()
+                .uri("http://jsonplaceholder.typicode.com/todos/{id}", id)
+                .retrieve()
+                .onStatus(status -> status.value() == 404, (req, res) -> {
+                    throw new TodoException.NotFound(id);
+                })
+                .body(Todo.class);
+
+        return result;
     }
 }

spring-http-client-1/initial/src/main/java/cholog/TodoClientWithRestTemplate.java

@@ -1,5 +1,8 @@
 package cholog;
 
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
 public class TodoClientWithRestTemplate {
@@ -10,8 +13,18 @@ public TodoClientWithRestTemplate(RestTemplate restTemplate) {
     }
 
     public Todo getTodoById(Long id) {
-        // TODO: restTemplate을 사용하여 요청을 보내고 결과를 Todo로 변환하여 반환
-        // TODO: 존재하지 않는 id로 요청을 보낼 경우 TodoException.NotFound 예외를 던짐
-        return new Todo();
+        try{
+            String Url = "http://jsonplaceholder.typicode.com/todos/1";
+            ResponseEntity<Todo> result
+                    = restTemplate.getForEntity(Url+"/{id}", Todo.class);
+            return result.getBody();
+        } catch (HttpClientErrorException e){
+            if (e.getStatusCode() == HttpStatus.NOT_FOUND){
+                throw new TodoException.NotFound(id);
+            }
+            throw new TodoException("Todo with id: " + id + "not found");
+
+        }
+
     }
 }

spring-mvc-1/initial/src/main/java/cholog/MemberController.java

@@ -1,18 +1,33 @@
 package cholog;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 public class MemberController {
-
-    public String world() {
+    @GetMapping("/hello")
+    public String world(@RequestParam(name = "name", required = false)  String name, Model model) {
         // TODO: /hello 요청 시 resources/templates/static.html 페이지가 응답할 수 있도록 설정하세요.
         // TODO: 쿼리 파라미터로 name 요청이 들어왔을 때 해당 값을 hello.html에서 사용할 수 있도록 하세요.
-        return null;
+        if (name == null){
+            // 쿼리 파라미터가 없는 경우
+            return "static";
+        } else {
+            // 쿼리 파라미터가 있는 경우.
+            model.addAttribute("name", name);
+            return "hello";
+        }
+
+
     }
 
+    @GetMapping("/json")
+    @ResponseBody
     public Person json() {
         // TODO: /json 요청 시 {"name": "brown", "age": 20} 데이터를 응답할 수 있도록 설정하세요.
-        return null;
+        return new Person("brown", 20);
     }
 }

spring-mvc-2/initial/src/main/java/cholog/MemberController.java

@@ -5,12 +5,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
+
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.*;
 
 @Controller
 public class MemberController {
@@ -19,41 +18,42 @@ public class MemberController {
     private final AtomicLong index = new AtomicLong(1);
 
     @PostMapping("/members")
-    public ResponseEntity<Void> create() {
+    public ResponseEntity<Void> create(@RequestBody Member member) {
         // TODO: member 정보를 받아서 생성한다.
-        Member newMember = Member.toEntity(null, index.getAndIncrement());
+        Member newMember = Member.toEntity(member, index.getAndIncrement());
         members.add(newMember);
         return ResponseEntity.created(URI.create("/members/" + newMember.getId())).build();
     }
 
     @GetMapping("/members")
     public ResponseEntity<List<Member>> read() {
         // TODO: 저장된 모든 member 정보를 반환한다.
-        return null;
+        return new ResponseEntity<>(members, HttpStatus.OK);
     }
 
     @PutMapping("/members/{id}")
-    public ResponseEntity<Void> update() {
+    public ResponseEntity<Void> update(@PathVariable Long id, @RequestBody Member newMember) {
         // TODO: member의 수정 정보와 url 상의 id 정보를 받아 member 정보를 수정한다.
         Member member = members.stream()
-            .filter(it -> Objects.equals(it.getId(), null))
+            .filter(it -> Objects.equals(it.getId(), id))
             .findFirst()
             .orElseThrow(RuntimeException::new);
 
-        member.update(null);
+        member.update(newMember);
+        //return new ResponseEntity<>(null, HttpStatus.NO_CONTENT); 이건 왜 안되는지?
         return null;
     }
 
     @DeleteMapping("/members/{id}")
-    public ResponseEntity<Void> delete() {
+    public ResponseEntity<Void> delete(@PathVariable Long id) {
         // TODO: url 상의 id 정보를 받아 member를 삭제한다.
         Member member = members.stream()
-            .filter(it -> Objects.equals(it.getId(), null))
+            .filter(it -> Objects.equals(it.getId(), id))
             .findFirst()
             .orElseThrow(RuntimeException::new);
 
         members.remove(member);
 
-        return null;
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 }