[JDBC 라이브러리 구현하기 - 1, 2단계] 현구막(최현구) 미션 제출합니다.

app/src/main/java/com/techcourse/AppWebApplicationInitializer.java

@@ -20,15 +20,6 @@ public class AppWebApplicationInitializer implements WebApplicationInitializer {
 
     @Override
     public void onStartup(ServletContext servletContext) {
-        try {
-            LOG.info("Start Components Initializer");
-            DatabasePopulatorUtils.execute(DataSourceConfig.getInstance());
-            ComponentContainer.initialize(DataSourceConfig.getInstance(), BASE_PACKAGE);
-        } catch (Exception e) {
-            LOG.error("Initialize Components Error: {}", e.getMessage());
-            throw new ComponentContainerException(e.getMessage());
-        }
-
         final DispatcherServlet dispatcherServlet = new DispatcherServlet();
         dispatcherServlet.addHandlerMapping(new AnnotationHandlerMapping(BASE_PACKAGE));
         dispatcherServlet.addHandlerAdapter(new AnnotationHandlerAdapter());

app/src/main/java/com/techcourse/config/DataSourceConfig.java

@@ -1,14 +1,21 @@
 package com.techcourse.config;
 
+import javax.sql.DataSource;
+import nextstep.web.annotation.Configuration;
+import nextstep.web.annotation.Initialize;
 import org.h2.jdbcx.JdbcDataSource;
 
 import java.util.Objects;
 
+@Configuration
 public class DataSourceConfig {
 
-    private static javax.sql.DataSource INSTANCE;
+    private static DataSource INSTANCE;
 
-    public static javax.sql.DataSource getInstance() {
+    private DataSourceConfig() {}
+
+    @Initialize
+    public static DataSource getInstance() {
         if (Objects.isNull(INSTANCE)) {
             INSTANCE = createJdbcDataSource();
         }
@@ -22,6 +29,4 @@ private static JdbcDataSource createJdbcDataSource() {
         jdbcDataSource.setPassword("");
         return jdbcDataSource;
     }
-
-    private DataSourceConfig() {}
 }

app/src/main/java/com/techcourse/controller/LoginController.java

@@ -9,6 +9,7 @@
 import jakarta.servlet.http.HttpSession;
 import nextstep.mvc.view.JspView;
 import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Controller;
 import nextstep.web.annotation.RequestMapping;
 import nextstep.web.support.RequestMethod;
@@ -22,6 +23,7 @@ public class LoginController {
 
     private final LoginService loginService;
 
+    @Autowired
     public LoginController(LoginService loginService) {
         this.loginService = loginService;
     }

app/src/main/java/com/techcourse/controller/RegisterController.java

@@ -7,6 +7,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import nextstep.mvc.view.JspView;
 import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Controller;
 import nextstep.web.annotation.RequestMapping;
 import nextstep.web.support.RequestMethod;
@@ -20,6 +21,7 @@ public class RegisterController {
 
     private final RegisterService registerService;
 
+    @Autowired
     public RegisterController(RegisterService registerService) {
         this.registerService = registerService;
     }

app/src/main/java/com/techcourse/controller/UserController.java

@@ -7,6 +7,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import nextstep.mvc.view.JsonView;
 import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Controller;
 import nextstep.web.annotation.RequestMapping;
 import nextstep.web.support.RequestMethod;
@@ -20,6 +21,7 @@ public class UserController {
 
     private final UserService userService;
 
+    @Autowired
     public UserController(UserService userService) {
         this.userService = userService;
     }

app/src/main/java/com/techcourse/dao/UserDao.java

@@ -10,21 +10,22 @@
 import nextstep.jdbc.RowMapper;
 import nextstep.jdbc.SimpleJdbcInsert;
 import nextstep.jdbc.exception.DataAccessException;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Repository;
 
 @Repository
 public class UserDao {
 
-    private static final RowMapper<User> MAPPER = (rs) -> new User(
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert jdbcInsert;
+    private final RowMapper<User> MAPPER = (rs) -> new User(
         rs.getLong("id"),
         rs.getString("account"),
         rs.getString("password"),
         rs.getString("email")
     );
 
-    private final JdbcTemplate jdbcTemplate;
-    private final SimpleJdbcInsert jdbcInsert;
-
+    @Autowired
     public UserDao(DataSource dataSource) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
         this.jdbcInsert = new SimpleJdbcInsert(dataSource, "users", "id");

app/src/main/java/com/techcourse/service/LoginService.java

@@ -6,13 +6,15 @@
 import com.techcourse.domain.User;
 import com.techcourse.exception.UnauthorizedException;
 import jakarta.servlet.http.HttpSession;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Service;
 
 @Service
 public class LoginService {
 
     private final UserDao userDao;
 
+    @Autowired
     public LoginService(UserDao userDao) {
         this.userDao = userDao;
     }

app/src/main/java/com/techcourse/service/RegisterService.java

@@ -5,6 +5,7 @@
 import com.techcourse.dao.UserDao;
 import com.techcourse.domain.User;
 import com.techcourse.exception.DuplicateAccountException;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,6 +17,7 @@ public class RegisterService {
 
     private final UserDao userDao;
 
+    @Autowired
     public RegisterService(UserDao userDao) {
         this.userDao = userDao;
     }

app/src/main/java/com/techcourse/service/UserService.java

@@ -3,13 +3,15 @@
 import com.techcourse.dao.UserDao;
 import com.techcourse.domain.User;
 import com.techcourse.exception.UserNotFoundException;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Service;
 
 @Service
 public class UserService {
 
     private final UserDao userDao;
 
+    @Autowired
     public UserService(UserDao userDao) {
         this.userDao = userDao;
     }

mvc/src/main/java/nextstep/mvc/controller/AnnotationHandlerMapping.java

@@ -3,6 +3,8 @@
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.Set;
 import nextstep.mvc.HandlerMapping;
+import nextstep.mvc.exception.ComponentContainerException;
+import nextstep.web.ComponentContainer;
 import nextstep.web.annotation.Controller;
 import nextstep.web.support.RequestMethod;
 import org.reflections.Reflections;
@@ -25,6 +27,21 @@ public AnnotationHandlerMapping(Object... basePackage) {
 
     @Override
     public void initialize() {
+        initializeComponentContainer();
+        initializeHandlerExecutions();
+    }
+
+    private void initializeComponentContainer() {
+        try {
+            LOG.info("Start Components Initializer");
+            ComponentContainer.initialize(basePackage);
+        } catch (Exception e) {
+            LOG.error("Initialize Components Error: {}", e.getMessage());
+            throw new ComponentContainerException(e.getMessage());
+        }
+    }
+
+    private void initializeHandlerExecutions() {
         try {
             Reflections reflections = new Reflections(basePackage, new TypeAnnotationsScanner(), new SubTypesScanner());
             Set<Class<?>> annotatedHandlers = reflections.getTypesAnnotatedWith(Controller.class);

mvc/src/main/java/nextstep/web/ComponentContainer.java

@@ -1,12 +1,18 @@
 package nextstep.web;
 
-import java.lang.reflect.Field;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.sql.DataSource;
+import java.util.stream.Collectors;
+import nextstep.mvc.exception.ComponentContainerException;
+import nextstep.web.annotation.Autowired;
+import nextstep.web.annotation.Configuration;
 import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.Initialize;
 import nextstep.web.annotation.Repository;
 import nextstep.web.annotation.Service;
 import org.reflections.Reflections;
@@ -17,39 +23,58 @@ public class ComponentContainer {
 
     private ComponentContainer() {}
 
-    public static void initialize(DataSource dataSource, Object... basePackage) throws Exception {
+    public static void initialize(Object... basePackage) throws Exception {
         Reflections reflections = new Reflections(basePackage);
-        initializeRepositories(reflections.getTypesAnnotatedWith(Repository.class), dataSource);
+        initializeConfigurations(reflections.getTypesAnnotatedWith(Configuration.class));
+        initializeComponents(reflections.getTypesAnnotatedWith(Repository.class));
         initializeComponents(reflections.getTypesAnnotatedWith(Service.class));
         initializeComponents(reflections.getTypesAnnotatedWith(Controller.class));
     }
 
-    private static void initializeRepositories(Set<Class<?>> repositoryTypes, DataSource dataSource) throws Exception {
-        for (Class<?> repository : repositoryTypes) {
-            Object instance = repository.getConstructor(DataSource.class).newInstance(dataSource);
-            COMPONENTS.put(repository, instance);
+    private static void initializeConfigurations(Set<Class<?>> configurationTypes) throws Exception {
+        for (Class<?> configuration : configurationTypes) {
+            List<Method> initializeMethods = Arrays.stream(configuration.getMethods())
+                .filter(method -> method.isAnnotationPresent(Initialize.class))
+                .collect(Collectors.toList());
+
+            Constructor<?> constructor = configuration.getDeclaredConstructor();
+            constructor.setAccessible(true);
+            initializeConfigurationMethods(constructor.newInstance(), initializeMethods);
+        }
+    }
+
+    private static void initializeConfigurationMethods(Object instance, List<Method> initializeMethods) throws Exception {
+        for (Method method : initializeMethods) {
+            COMPONENTS.put(method.getReturnType(), method.invoke(instance));
         }
     }
 
     private static void initializeComponents(Set<Class<?>> componentTypes) throws Exception {
         for (Class<?> type : componentTypes) {
-            Class<?>[] fieldTypes = getFieldTypes(type);
-            Object[] fieldObjects = getFieldObjects(fieldTypes);
+            Constructor<?> constructor = getConstructor(type);
+            Object[] parameterObjects = getConstructorParameterObjects(constructor);
 
-            Object instance = type.getConstructor(fieldTypes).newInstance(fieldObjects);
-            COMPONENTS.put(type, instance);
+            COMPONENTS.put(type, constructor.newInstance(parameterObjects));
         }
     }
 
-    private static Class<?>[] getFieldTypes(Class<?> classTypes) {
-        return Arrays.stream(classTypes.getDeclaredFields())
-            .map(Field::getType)
-            .filter(COMPONENTS::containsKey)
-            .toArray(Class<?>[]::new);
+    private static Constructor<?> getConstructor(Class<?> type) {
+        return Arrays.stream(type.getConstructors())
+            .filter(constructor -> constructor.isAnnotationPresent(Autowired.class))
+            .findAny()
+            .orElseGet(() -> getDefaultConstructor(type));
+    }
+
+    private static Constructor<?> getDefaultConstructor(Class<?> type) {
+        try {
+            return type.getDeclaredConstructor();
+        } catch (NoSuchMethodException e) {
+            throw new ComponentContainerException("기본 생성자 탐색에 실패했습니다.");
+        }
     }
 
-    private static Object[] getFieldObjects(Class<?>[] fieldTypes) {
-        return Arrays.stream(fieldTypes)
+    private static Object[] getConstructorParameterObjects(Constructor<?> constructor) {
+        return Arrays.stream(constructor.getParameterTypes())
             .map(COMPONENTS::get)
             .toArray(Object[]::new);
     }

mvc/src/main/java/nextstep/web/annotation/Autowired.java

@@ -0,0 +1,11 @@
+package nextstep.web.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.CONSTRUCTOR)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Autowired {
+}

mvc/src/main/java/nextstep/web/annotation/Configuration.java

@@ -0,0 +1,11 @@
+package nextstep.web.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Configuration {
+}

mvc/src/main/java/nextstep/web/annotation/Initialize.java

@@ -0,0 +1,11 @@
+package nextstep.web.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Initialize {
+}

mvc/src/test/java/nextstep/mvc/controller/AnnotationHandlerMappingTest.java

@@ -19,8 +19,7 @@ class AnnotationHandlerMappingTest {
     private AnnotationHandlerMapping handlerMapping;
 
     @BeforeEach
-    void setUp() throws Exception {
-        ComponentContainer.initialize(mock(DataSource.class), "samples");
+    void setUp() {
         handlerMapping = new AnnotationHandlerMapping("samples");
         handlerMapping.initialize();
     }