diff --git a/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java b/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java index 02e1010d..5be08773 100644 --- a/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java +++ b/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java @@ -5,9 +5,7 @@ @Component public class AutowiredBean { - /* - 어떤 방법으로 Component에 Bean을 주입하는지 학습하기 - */ + @Autowired private SpringBean springBean; public String sayHello() { diff --git a/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java b/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java index 871bf83e..e2490848 100644 --- a/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java +++ b/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java @@ -5,6 +5,7 @@ /* 어떤 어노테이션을 붙였을 때 Bean으로 생성되는지 학습하기 */ +@Component public class SpringBean { public String hello() { return "Hello"; diff --git a/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java b/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java index 266e70b1..1bd8a966 100644 --- a/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java +++ b/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java @@ -6,9 +6,10 @@ public class ConstructorInjection { private InjectionBean injectionBean; - /* - ConstructorInjection으로 InjectionBean 주입받기 - */ + public ConstructorInjection(InjectionBean injectionBean){ + this.injectionBean = injectionBean; + } + public String sayHello() { return injectionBean.hello(); } diff --git a/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java b/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java index b2718b03..6c649f24 100644 --- a/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java +++ b/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java @@ -6,9 +6,7 @@ @Service public class FieldInjection { - /* - FieldInjection으로 InjectionBean 주입받기 - */ + @Autowired private InjectionBean injectionBean; public String sayHello() { diff --git a/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java b/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java index 7dc3f162..6250c8ac 100644 --- a/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java +++ b/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java @@ -7,9 +7,10 @@ public class SetterInjection { private InjectionBean injectionBean; - /* - Setter Injection으로 InjectionBean 주입받기 - */ + @Autowired + public void setInjectionBean(InjectionBean injectionBean){ + this.injectionBean = injectionBean; + } public String sayHello() { return injectionBean.hello(); diff --git a/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java b/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java index ba2e8eb8..30df2cce 100644 --- a/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java +++ b/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java @@ -1,10 +1,11 @@ package cholog.scan; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; @Configuration -/* -ComponentScan에 대해 학습하고, ComponenetScanBean을 Bean으로 등록하기 - */ +@ComponentScan(basePackages = "cholog.scan") public class ContextConfiguration { } + diff --git a/spring-mvc-1/initial/src/main/java/cholog/MemberController.java b/spring-mvc-1/initial/src/main/java/cholog/MemberController.java index 08322a4e..0a8199d8 100644 --- a/spring-mvc-1/initial/src/main/java/cholog/MemberController.java +++ b/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); } } diff --git a/spring-mvc-1/initial/src/main/resources/static/hi.html b/spring-mvc-1/initial/src/main/resources/static/index.html similarity index 100% rename from spring-mvc-1/initial/src/main/resources/static/hi.html rename to spring-mvc-1/initial/src/main/resources/static/index.html diff --git a/spring-mvc-1/initial/src/main/resources/templates/static.html b/spring-mvc-1/initial/src/main/resources/static/static.html similarity index 100% rename from spring-mvc-1/initial/src/main/resources/templates/static.html rename to spring-mvc-1/initial/src/main/resources/static/static.html diff --git a/spring-mvc-2/initial/src/main/java/cholog/MemberController.java b/spring-mvc-2/initial/src/main/java/cholog/MemberController.java index 5a380e7a..927d98a4 100644 --- a/spring-mvc-2/initial/src/main/java/cholog/MemberController.java +++ b/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,9 +18,9 @@ public class MemberController { private final AtomicLong index = new AtomicLong(1); @PostMapping("/members") - public ResponseEntity create() { + public ResponseEntity 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(); } @@ -29,31 +28,32 @@ public ResponseEntity create() { @GetMapping("/members") public ResponseEntity> read() { // TODO: 저장된 모든 member 정보를 반환한다. - return null; + return new ResponseEntity<>(members, HttpStatus.OK); } @PutMapping("/members/{id}") - public ResponseEntity update() { + public ResponseEntity 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 delete() { + public ResponseEntity 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); } }