Skip to content

Commit 92b9427

Browse files
javajigijavajigi
committed
모든 소스 코드가 tab을 사용하지 않고 space를 사용하도록 수정함.
1 parent 1102e98 commit 92b9427

22 files changed

+392
-401
lines changed

‎src/main/java/core/db/DataBase.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
import next.model.User;
99

1010
public class DataBase {
11-
private static Map<String, User> users = Maps.newHashMap();
12-
13-
static {
14-
users.put("admin", new User("admin", "password", "자바지기", "[email protected]"));
15-
}
16-
17-
public static void addUser(User user) {
18-
users.put(user.getUserId(), user);
19-
}
20-
21-
public static User findUserById(String userId) {
22-
return users.get(userId);
23-
}
24-
25-
public static Collection<User> findAll() {
26-
return users.values();
27-
}
11+
private static Map<String, User> users = Maps.newHashMap();
12+
13+
static {
14+
users.put("admin", new User("admin", "password", "자바지기", "[email protected]"));
15+
}
16+
17+
public static void addUser(User user) {
18+
users.put(user.getUserId(), user);
19+
}
20+
21+
public static User findUserById(String userId) {
22+
return users.get(userId);
23+
}
24+
25+
public static Collection<User> findAll() {
26+
return users.values();
27+
}
2828
}

‎src/main/java/core/jdbc/ConnectionManager.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@
88
import org.apache.commons.dbcp2.BasicDataSource;
99

1010
public class ConnectionManager {
11-
private static final String DB_DRIVER = "org.h2.Driver";
12-
private static final String DB_URL = "jdbc:h2:~/jwp-basic;AUTO_SERVER=TRUE";
13-
private static final String DB_USERNAME = "sa";
14-
private static final String DB_PW = "";
15-
16-
public static DataSource getDataSource() {
17-
BasicDataSource ds = new BasicDataSource();
18-
ds.setDriverClassName(DB_DRIVER);
19-
ds.setUrl(DB_URL);
20-
ds.setUsername(DB_USERNAME);
21-
ds.setPassword(DB_PW);
22-
return ds;
23-
}
24-
25-
public static Connection getConnection() {
26-
try {
27-
return getDataSource().getConnection();
28-
} catch (SQLException e) {
29-
throw new IllegalStateException(e);
30-
}
31-
}
11+
private static final String DB_DRIVER = "org.h2.Driver";
12+
private static final String DB_URL = "jdbc:h2:~/jwp-basic;AUTO_SERVER=TRUE";
13+
private static final String DB_USERNAME = "sa";
14+
private static final String DB_PW = "";
15+
16+
public static DataSource getDataSource() {
17+
BasicDataSource ds = new BasicDataSource();
18+
ds.setDriverClassName(DB_DRIVER);
19+
ds.setUrl(DB_URL);
20+
ds.setUsername(DB_USERNAME);
21+
ds.setPassword(DB_PW);
22+
return ds;
23+
}
24+
25+
public static Connection getConnection() {
26+
try {
27+
return getDataSource().getConnection();
28+
} catch (SQLException e) {
29+
throw new IllegalStateException(e);
30+
}
31+
}
3232
}

‎src/main/java/core/mvc/Controller.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
import javax.servlet.http.HttpServletResponse;
55

66
public interface Controller {
7-
String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception;
7+
String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception;
88
}

‎src/main/java/core/mvc/DispatcherServlet.java‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,41 @@
1414

1515
@WebServlet(name = "dispatcher", urlPatterns = "/", loadOnStartup = 1)
1616
public class DispatcherServlet extends HttpServlet {
17-
private static final long serialVersionUID = 1L;
18-
private static final Logger logger = LoggerFactory.getLogger(DispatcherServlet.class);
19-
private static final String DEFAULT_REDIRECT_PREFIX = "redirect:";
20-
21-
private RequestMapping rm;
22-
23-
@Override
24-
public void init() throws ServletException {
25-
rm = new RequestMapping();
26-
rm.initMapping();
27-
}
28-
29-
@Override
30-
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
31-
String requestUri = req.getRequestURI();
32-
logger.debug("Method : {}, Request URI : {}", req.getMethod(), requestUri);
33-
34-
Controller controller = rm.findController(requestUri);
35-
try {
36-
String viewName = controller.execute(req, resp);
37-
move(viewName, req, resp);
38-
} catch (Throwable e) {
39-
logger.error("Exception : {}", e);
40-
throw new ServletException(e.getMessage());
41-
}
42-
}
43-
44-
private void move(String viewName, HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
45-
if (viewName.startsWith(DEFAULT_REDIRECT_PREFIX)) {
46-
resp.sendRedirect(viewName.substring(DEFAULT_REDIRECT_PREFIX.length()));
47-
return;
48-
}
49-
50-
RequestDispatcher rd = req.getRequestDispatcher(viewName);
51-
rd.forward(req, resp);
52-
}
17+
private static final long serialVersionUID = 1L;
18+
private static final Logger logger = LoggerFactory.getLogger(DispatcherServlet.class);
19+
private static final String DEFAULT_REDIRECT_PREFIX = "redirect:";
20+
21+
private RequestMapping rm;
22+
23+
@Override
24+
public void init() throws ServletException {
25+
rm = new RequestMapping();
26+
rm.initMapping();
27+
}
28+
29+
@Override
30+
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
31+
String requestUri = req.getRequestURI();
32+
logger.debug("Method : {}, Request URI : {}", req.getMethod(), requestUri);
33+
34+
Controller controller = rm.findController(requestUri);
35+
try {
36+
String viewName = controller.execute(req, resp);
37+
move(viewName, req, resp);
38+
} catch (Throwable e) {
39+
logger.error("Exception : {}", e);
40+
throw new ServletException(e.getMessage());
41+
}
42+
}
43+
44+
private void move(String viewName, HttpServletRequest req, HttpServletResponse resp)
45+
throws ServletException, IOException {
46+
if (viewName.startsWith(DEFAULT_REDIRECT_PREFIX)) {
47+
resp.sendRedirect(viewName.substring(DEFAULT_REDIRECT_PREFIX.length()));
48+
return;
49+
}
50+
51+
RequestDispatcher rd = req.getRequestDispatcher(viewName);
52+
rd.forward(req, resp);
53+
}
5354
}

‎src/main/java/core/mvc/ForwardController.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
import javax.servlet.http.HttpServletResponse;
55

66
public class ForwardController implements Controller {
7-
private String forwardUrl;
7+
private String forwardUrl;
88

9-
public ForwardController(String forwardUrl) {
10-
this.forwardUrl = forwardUrl;
11-
if (forwardUrl == null) {
12-
throw new NullPointerException("forwardUrl is null. 이동할 URL을 입력하세요.");
13-
}
14-
}
9+
public ForwardController(String forwardUrl) {
10+
this.forwardUrl = forwardUrl;
11+
if (forwardUrl == null) {
12+
throw new NullPointerException("forwardUrl is null. 이동할 URL을 입력하세요.");
13+
}
14+
}
1515

16-
@Override
17-
public String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception {
18-
return forwardUrl;
19-
}
16+
@Override
17+
public String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception {
18+
return forwardUrl;
19+
}
2020
}

‎src/main/java/core/mvc/RequestMapping.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@
1616
import next.controller.UpdateUserController;
1717

1818
public class RequestMapping {
19-
private static final Logger logger = LoggerFactory.getLogger(DispatcherServlet.class);
20-
private Map<String, Controller> mappings = new HashMap<>();
21-
22-
void initMapping() {
23-
mappings.put("/", new HomeController());
24-
mappings.put("/users/form", new ForwardController("/user/form.jsp"));
25-
mappings.put("/users/loginForm", new ForwardController("/user/login.jsp"));
26-
mappings.put("/users", new ListUserController());
27-
mappings.put("/users/login", new LoginController());
28-
mappings.put("/users/profile", new ProfileController());
29-
mappings.put("/users/logout", new LogoutController());
30-
mappings.put("/users/create", new CreateUserController());
31-
mappings.put("/users/updateForm", new UpdateFormUserController());
32-
mappings.put("/users/update", new UpdateUserController());
33-
34-
logger.info("Initialized Request Mapping!");
35-
}
36-
37-
public Controller findController(String url) {
38-
return mappings.get(url);
39-
}
40-
41-
void put(String url, Controller controller) {
42-
mappings.put(url, controller);
43-
}
19+
private static final Logger logger = LoggerFactory.getLogger(DispatcherServlet.class);
20+
private Map<String, Controller> mappings = new HashMap<>();
21+
22+
void initMapping() {
23+
mappings.put("/", new HomeController());
24+
mappings.put("/users/form", new ForwardController("/user/form.jsp"));
25+
mappings.put("/users/loginForm", new ForwardController("/user/login.jsp"));
26+
mappings.put("/users", new ListUserController());
27+
mappings.put("/users/login", new LoginController());
28+
mappings.put("/users/profile", new ProfileController());
29+
mappings.put("/users/logout", new LogoutController());
30+
mappings.put("/users/create", new CreateUserController());
31+
mappings.put("/users/updateForm", new UpdateFormUserController());
32+
mappings.put("/users/update", new UpdateUserController());
33+
34+
logger.info("Initialized Request Mapping!");
35+
}
36+
37+
public Controller findController(String url) {
38+
return mappings.get(url);
39+
}
40+
41+
void put(String url, Controller controller) {
42+
mappings.put(url, controller);
43+
}
4444
}

‎src/main/java/core/web/filter/CharacterEncodingFilter.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212

1313
@WebFilter("/*")
1414
public class CharacterEncodingFilter implements Filter {
15-
private static final String DEFAULT_ENCODING = "UTF-8";
15+
private static final String DEFAULT_ENCODING = "UTF-8";
1616

17-
@Override
18-
public void init(FilterConfig filterConfig) throws ServletException {
19-
}
17+
@Override
18+
public void init(FilterConfig filterConfig) throws ServletException {
19+
}
2020

21-
@Override
22-
public void doFilter(ServletRequest request, ServletResponse response,
23-
FilterChain chain) throws IOException, ServletException {
24-
request.setCharacterEncoding(DEFAULT_ENCODING);
25-
response.setCharacterEncoding(DEFAULT_ENCODING);
26-
chain.doFilter(request, response);
21+
@Override
22+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
23+
throws IOException, ServletException {
24+
request.setCharacterEncoding(DEFAULT_ENCODING);
25+
response.setCharacterEncoding(DEFAULT_ENCODING);
26+
chain.doFilter(request, response);
2727

28-
}
28+
}
2929

30-
@Override
31-
public void destroy() {
32-
}
30+
@Override
31+
public void destroy() {
32+
}
3333

3434
}

‎src/main/java/core/web/filter/ResourceFilter.java‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,47 @@
1919

2020
@WebFilter("/*")
2121
public class ResourceFilter implements Filter {
22-
private static final Logger logger = LoggerFactory.getLogger(ResourceFilter.class);
23-
private static final List<String> resourcePrefixs = new ArrayList<>();
24-
static{
25-
resourcePrefixs.add("/css");
26-
resourcePrefixs.add("/js");
27-
resourcePrefixs.add("/fonts");
28-
resourcePrefixs.add("/images");
29-
resourcePrefixs.add("/favicon.ico");
30-
}
31-
32-
private RequestDispatcher defaultRequestDispatcher;
33-
34-
@Override
35-
public void init(FilterConfig filterConfig) throws ServletException {
36-
this.defaultRequestDispatcher =
37-
filterConfig.getServletContext().getNamedDispatcher("default");
38-
}
22+
private static final Logger logger = LoggerFactory.getLogger(ResourceFilter.class);
23+
private static final List<String> resourcePrefixs = new ArrayList<>();
24+
static {
25+
resourcePrefixs.add("/css");
26+
resourcePrefixs.add("/js");
27+
resourcePrefixs.add("/fonts");
28+
resourcePrefixs.add("/images");
29+
resourcePrefixs.add("/favicon.ico");
30+
}
3931

40-
@Override
41-
public void doFilter(ServletRequest request, ServletResponse response,
42-
FilterChain chain) throws IOException, ServletException {
43-
HttpServletRequest req = (HttpServletRequest) request;
44-
String path = req.getRequestURI().substring(req.getContextPath().length());
45-
if (isResourceUrl(path)) {
46-
logger.debug("path : {}", path);
47-
defaultRequestDispatcher.forward(request, response);
48-
} else {
49-
chain.doFilter(request, response);
50-
}
51-
}
52-
53-
private boolean isResourceUrl(String url) {
54-
for (String prefix : resourcePrefixs) {
55-
if (url.startsWith(prefix)) {
56-
return true;
57-
}
58-
}
59-
return false;
60-
}
32+
private RequestDispatcher defaultRequestDispatcher;
6133

62-
@Override
63-
public void destroy() {
64-
}
34+
@Override
35+
public void init(FilterConfig filterConfig) throws ServletException {
36+
this.defaultRequestDispatcher = filterConfig.getServletContext().getNamedDispatcher("default");
37+
}
38+
39+
@Override
40+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
41+
throws IOException, ServletException {
42+
HttpServletRequest req = (HttpServletRequest) request;
43+
String path = req.getRequestURI().substring(req.getContextPath().length());
44+
if (isResourceUrl(path)) {
45+
logger.debug("path : {}", path);
46+
defaultRequestDispatcher.forward(request, response);
47+
} else {
48+
chain.doFilter(request, response);
49+
}
50+
}
51+
52+
private boolean isResourceUrl(String url) {
53+
for (String prefix : resourcePrefixs) {
54+
if (url.startsWith(prefix)) {
55+
return true;
56+
}
57+
}
58+
return false;
59+
}
60+
61+
@Override
62+
public void destroy() {
63+
}
6564

6665
}

0 commit comments

Comments
 (0)