[spring-core-2] ivy.lee(이다예) 과제 제출합니다.

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() {

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";

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();
     }

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() {

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();

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 {
 }
+

spring-core-2/initial/src/main/java/cholog/configuration/AuthService.java

@@ -1,5 +1,7 @@
 package cholog.configuration;
+import org.springframework.stereotype.Component;
 
+//@Component
 public class AuthService {
     public String findMemberName() {
         return "사용자";

spring-core-2/initial/src/main/java/cholog/configuration/config/AppConfig.java

@@ -2,18 +2,23 @@
 
 import cholog.configuration.AuthService;
 import cholog.configuration.AuthenticationPrincipalArgumentResolver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
 
-// TODO: Java-based Configuration을 하기 위한 클래스로 지정하기
+@Configuration
+@ComponentScan(basePackages = "cholog.scan")
 public class AppConfig {
 
-    // TODO: AuthService 빈을 등록하기
+    @Bean
     public AuthService authService() {
-        return null;
+        return new AuthService();
+        // 실제 구현체가 없으면 빈이 등록되지 않는다.
     }
 
-    // TODO: AuthenticationPrincipalArgumentResolver를 빈 등록하고 authService에 대한 의존성을 주입하기
-    public AuthenticationPrincipalArgumentResolver authenticationPrincipalArgumentResolver() {
-        return null;
+    @Bean
+    public AuthenticationPrincipalArgumentResolver authenticationPrincipalArgumentResolver(AuthService authService) {
+        return new AuthenticationPrincipalArgumentResolver(authService);
     }
 
 }

spring-core-2/initial/src/main/java/cholog/profile/config/ProfileConfig.java

@@ -3,16 +3,21 @@
 import cholog.profile.InmemoryMessageRepository;
 import cholog.profile.JdbcMessageRepository;
 import cholog.profile.MessageRepository;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
-// TODO: Java-based Configuration을 하기 위한 클래스로 지정하기
+@Configuration
 public class ProfileConfig {
 
-    // TODO: dev 프로파일일 때만 InmemoryMessageRepository 빈이 등록되도록 설정하기
+    @Bean("dataSource")
+    @Profile("dev")
     public MessageRepository inMemoryMessageRepository() {
         return new InmemoryMessageRepository();
     }
 
-    // TODO: prod 프로파일일 때만 InmemoryMessageRepository 빈이 등록되도록 설정하기
+    @Bean("dataSource")
+    @Profile("prod")
     public MessageRepository jdbcMessageRepository() {
         return new JdbcMessageRepository();
     }

spring-core-2/initial/src/main/java/cholog/property/config/AuthConfig.java

@@ -1,11 +1,18 @@
 package cholog.property.config;
 
 import cholog.property.JwtTokenKeyProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
-// TODO: Java-based Configuration을 하기 위한 클래스로 지정하기
+
+@Configuration
 public class AuthConfig {
-    // TODO: application.properties의 security.jwt.token.secret-key 값을 활용하여 JwtTokenKeyProvider를 빈으로 등록하기
+    @Value("${security.jwt.token.secret-key}")
+    private String secretKey;
+
+    @Bean
     public JwtTokenKeyProvider jwtTokenKeyProvider() {
-        return new JwtTokenKeyProvider("");
+        return new JwtTokenKeyProvider(secretKey);
     }
 }

spring-core-2/initial/src/main/java/cholog/property/config/PropertySourceConfig.java

@@ -2,10 +2,14 @@
 
 import cholog.property.GoogleDriveRestClient;
 import cholog.property.GoogleMapsRestClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 
-// TODO: Java-based Configuration을 하기 위한 클래스로 지정하기
-// TODO: ext-api.properties 파일을 활용하기 위한 설정 추가하기
+@Configuration
+@PropertySource("classpath:ext-api.properties")
 public class PropertySourceConfig {
 
     private final Environment env;
@@ -14,15 +18,17 @@ public PropertySourceConfig(Environment env) {
         this.env = env;
     }
 
-    // TODO: ext-api.properties의 google.api.endpoint 값을 Environment를 사용해서 가져오기
-    // TODO: 위 endpoint 값을 사용하여 GoogleMapsRestClient를 빈으로 등록하기
+    @Bean
     public GoogleMapsRestClient googleMapsRestClient() {
-        return new GoogleMapsRestClient("");
+        String endpoint = env.getProperty("google.api.endpoint");
+        return new GoogleMapsRestClient(endpoint);
     }
 
-    // TODO: ext-api.properties의 google.api.endpoint 값을 어노테이션을 사용해서 가져오기
-    // TODO: 위 endpoint 값을 사용하여 GoogleMapsRestClient를 빈으로 등록하기
+    @Value("${google.api.endpoint}")
+    private String googleApiEndpoint;
+
+    @Bean
     public GoogleDriveRestClient googleDriveRestClient() {
-        return new GoogleDriveRestClient("");
+        return new GoogleDriveRestClient(googleApiEndpoint);
     }
 }

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);
     }
 }