-
Notifications
You must be signed in to change notification settings - Fork 300
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JDBC 라이브러리 구현하기 - 1단계] 그레이(김동욱) 미션 제출합니다. (#279)
* 패키지 위치 변경 및 코드 정리 * 패키지 위치 변경 및 코드 정리 * 패키지 위치 변경 및 코드 정리 * feat: JdbcTemplate execute 메서드 추가 * feat: RowMapper 및 ResultSetExtractor 추가 * feat: 단건 조회 및 전체 조회 메서드 추가 * refactor: userDao JdbcTemplate을 사용하도록 수정 * test: userDao 테스트 수정 * feat: resultSet close 추가 * chore: 필요없는 분기 삭제 * chore: rowMapper의 불필요한 rowNum 삭제 --------- Co-authored-by: kang-hyungu <[email protected]>
- Loading branch information
1 parent
2832af7
commit 9a463fc
Showing
112 changed files
with
2,907 additions
and
269 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| name: SonarCloud | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| types: [opened, synchronize, reopened] | ||
| jobs: | ||
| build: | ||
| name: Build and analyze | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 11 | ||
| distribution: 'corretto' # Alternative distribution options are available | ||
| - name: Cache SonarCloud packages | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.sonar/cache | ||
| key: ${{ runner.os }}-sonar | ||
| restore-keys: ${{ runner.os }}-sonar | ||
| - name: Cache Gradle packages | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.gradle/caches | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} | ||
| restore-keys: ${{ runner.os }}-gradle | ||
| - name: Build and analyze | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| run: ./gradlew clean build codeCoverageReport sonar --info -x :study:build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -171,3 +171,5 @@ Temporary Items | |
|
|
||
| tomcat.* | ||
| tomcat.*/** | ||
|
|
||
| **/WEB-INF/classes/** | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
app/src/main/java/com/techcourse/AppWebApplicationInitializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,121 +1,79 @@ | ||
| package com.techcourse.dao; | ||
|
|
||
| import com.techcourse.domain.User; | ||
| import nextstep.jdbc.JdbcTemplate; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import javax.sql.DataSource; | ||
| import java.sql.Connection; | ||
| import java.sql.PreparedStatement; | ||
| import java.sql.ResultSet; | ||
| import java.sql.SQLException; | ||
| import java.util.List; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.jdbc.core.JdbcTemplate; | ||
| import org.springframework.jdbc.core.RowMapper; | ||
|
|
||
| public class UserDao { | ||
|
|
||
| private static final Logger log = LoggerFactory.getLogger(UserDao.class); | ||
|
|
||
| private final DataSource dataSource; | ||
|
|
||
| public UserDao(final DataSource dataSource) { | ||
| this.dataSource = dataSource; | ||
| } | ||
| private final JdbcTemplate jdbcTemplate; | ||
| private final RowMapper<User> rowMapper = resultSet -> { | ||
| long id = resultSet.getLong("id"); | ||
| String account = resultSet.getString("account"); | ||
| String password = resultSet.getString("password"); | ||
| String email = resultSet.getString("email"); | ||
| return new User(id, account, password, email); | ||
| }; | ||
|
|
||
| public UserDao(final JdbcTemplate jdbcTemplate) { | ||
| this.dataSource = null; | ||
| this.jdbcTemplate = jdbcTemplate; | ||
| } | ||
|
|
||
| public void insert(final User user) { | ||
| final var sql = "insert into users (account, password, email) values (?, ?, ?)"; | ||
| String sql = "insert into users (account, password, email) values (?, ?, ?)"; | ||
|
|
||
| Connection conn = null; | ||
| PreparedStatement pstmt = null; | ||
| try { | ||
| conn = dataSource.getConnection(); | ||
| pstmt = conn.prepareStatement(sql); | ||
|
|
||
| log.debug("query : {}", sql); | ||
|
|
||
| pstmt.setString(1, user.getAccount()); | ||
| pstmt.setString(2, user.getPassword()); | ||
| pstmt.setString(3, user.getEmail()); | ||
| pstmt.executeUpdate(); | ||
| jdbcTemplate.execute(sql, user.getAccount(), user.getPassword(), user.getEmail()); | ||
| } catch (SQLException e) { | ||
| log.error(e.getMessage(), e); | ||
| throw new RuntimeException(e); | ||
| } finally { | ||
| try { | ||
| if (pstmt != null) { | ||
| pstmt.close(); | ||
| } | ||
| } catch (SQLException ignored) {} | ||
|
|
||
| try { | ||
| if (conn != null) { | ||
| conn.close(); | ||
| } | ||
| } catch (SQLException ignored) {} | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
|
|
||
| public void update(final User user) { | ||
| // todo | ||
| String sql = "update users set account=?, password=?, email=? where id = ?"; | ||
| try { | ||
| jdbcTemplate.execute( | ||
| sql, | ||
| user.getAccount(), | ||
| user.getPassword(), | ||
| user.getEmail(), | ||
| user.getId() | ||
| ); | ||
| } catch (SQLException e) { | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
|
|
||
| public List<User> findAll() { | ||
| // todo | ||
| return null; | ||
| String sql = "select id, account, password, email from users"; | ||
| try { | ||
| return jdbcTemplate.query(sql, rowMapper); | ||
| } catch (SQLException e) { | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
|
|
||
| public User findById(final Long id) { | ||
| final var sql = "select id, account, password, email from users where id = ?"; | ||
|
|
||
| Connection conn = null; | ||
| PreparedStatement pstmt = null; | ||
| ResultSet rs = null; | ||
| String sql = "select id, account, password, email from users where id = ?"; | ||
| try { | ||
| conn = dataSource.getConnection(); | ||
| pstmt = conn.prepareStatement(sql); | ||
| pstmt.setLong(1, id); | ||
| rs = pstmt.executeQuery(); | ||
|
|
||
| log.debug("query : {}", sql); | ||
|
|
||
| if (rs.next()) { | ||
| return new User( | ||
| rs.getLong(1), | ||
| rs.getString(2), | ||
| rs.getString(3), | ||
| rs.getString(4)); | ||
| } | ||
| return null; | ||
| return jdbcTemplate.queryForObject(sql, rowMapper, id); | ||
| } catch (SQLException e) { | ||
| log.error(e.getMessage(), e); | ||
| throw new RuntimeException(e); | ||
| } finally { | ||
| try { | ||
| if (rs != null) { | ||
| rs.close(); | ||
| } | ||
| } catch (SQLException ignored) {} | ||
|
|
||
| try { | ||
| if (pstmt != null) { | ||
| pstmt.close(); | ||
| } | ||
| } catch (SQLException ignored) {} | ||
|
|
||
| try { | ||
| if (conn != null) { | ||
| conn.close(); | ||
| } | ||
| } catch (SQLException ignored) {} | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
|
|
||
| public User findByAccount(final String account) { | ||
| // todo | ||
| return null; | ||
| String sql = "select id, account, password, email from users where account = ?"; | ||
| try { | ||
| return jdbcTemplate.queryForObject(sql, rowMapper, account); | ||
| } catch (SQLException e) { | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.