Skip to content

Commit ca51b7f

Browse files
committed
refactor(RowMappers): move row mappers for the ru.mystamps.web.common package to this package.
Addressed to #927 No functional changes.
1 parent 56a44c6 commit ca51b7f

File tree

8 files changed

+11
-17
lines changed

8 files changed

+11
-17
lines changed

src/main/java/ru/mystamps/web/support/jdbc/RowMappers.java renamed to src/main/java/ru/mystamps/web/common/RowMappers.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
18-
package ru.mystamps.web.support.jdbc;
19-
20-
import ru.mystamps.web.common.EntityWithParentDto;
21-
import ru.mystamps.web.common.JdbcUtils;
22-
import ru.mystamps.web.common.LinkEntityDto;
18+
package ru.mystamps.web.common;
2319

2420
import java.sql.ResultSet;
2521
import java.sql.SQLException;

src/main/java/ru/mystamps/web/feature/category/JdbcCategoryDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import ru.mystamps.web.common.EntityWithParentDto;
2929
import ru.mystamps.web.common.JdbcUtils;
3030
import ru.mystamps.web.common.LinkEntityDto;
31-
import ru.mystamps.web.support.jdbc.RowMappers;
31+
import ru.mystamps.web.common.RowMappers;
3232

3333
import java.util.Collections;
3434
import java.util.Date;

src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public List<LinkEntityDto> findLastCreated(int quantity) {
8787
return jdbcTemplate.query(
8888
findLastCreatedCollectionsSql,
8989
Collections.singletonMap("quantity", quantity),
90-
ru.mystamps.web.support.jdbc.RowMappers::forLinkEntityDto
90+
ru.mystamps.web.common.RowMappers::forLinkEntityDto
9191
);
9292
}
9393

src/main/java/ru/mystamps/web/feature/country/JdbcCountryDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.jdbc.support.KeyHolder;
2828
import ru.mystamps.web.common.JdbcUtils;
2929
import ru.mystamps.web.common.LinkEntityDto;
30-
import ru.mystamps.web.support.jdbc.RowMappers;
30+
import ru.mystamps.web.common.RowMappers;
3131

3232
import java.util.Collections;
3333
import java.util.Date;

src/main/java/ru/mystamps/web/feature/participant/JdbcParticipantDao.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ public Integer add(AddParticipantDbDto participant) {
9292
public List<EntityWithParentDto> findBuyersWithParents() {
9393
return jdbcTemplate.query(
9494
findBuyersWithParentNamesSql,
95-
ru.mystamps.web.support.jdbc.RowMappers::forEntityWithParentDto
95+
ru.mystamps.web.common.RowMappers::forEntityWithParentDto
9696
);
9797
}
9898

9999
@Override
100100
public List<EntityWithParentDto> findSellersWithParents() {
101101
return jdbcTemplate.query(
102102
findSellersWithParentNamesSql,
103-
ru.mystamps.web.support.jdbc.RowMappers::forEntityWithParentDto
103+
ru.mystamps.web.common.RowMappers::forEntityWithParentDto
104104
);
105105
}
106106

src/main/java/ru/mystamps/web/feature/series/RowMappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.sql.SQLException;
2727
import java.util.Date;
2828

29-
import static ru.mystamps.web.support.jdbc.RowMappers.createLinkEntityDto;
29+
import static ru.mystamps.web.common.RowMappers.createLinkEntityDto;
3030

3131
final class RowMappers {
3232

src/main/java/ru/mystamps/web/feature/series/importing/RowMappers.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import java.sql.ResultSet;
2424
import java.sql.SQLException;
2525

26+
import static ru.mystamps.web.common.RowMappers.createLinkEntityDto;
27+
2628
final class RowMappers {
2729

2830
private RowMappers() {
@@ -41,14 +43,14 @@ private RowMappers() {
4143
/* default */ static SeriesParsedDataDto forSeriesParsedDataDto(ResultSet rs, int unused)
4244
throws SQLException {
4345

44-
LinkEntityDto category = ru.mystamps.web.support.jdbc.RowMappers.createLinkEntityDto(
46+
LinkEntityDto category = createLinkEntityDto(
4547
rs,
4648
"category_id",
4749
"category_slug",
4850
"category_name"
4951
);
5052

51-
LinkEntityDto country = ru.mystamps.web.support.jdbc.RowMappers.createLinkEntityDto(
53+
LinkEntityDto country = createLinkEntityDto(
5254
rs,
5355
"country_id",
5456
"country_slug",

src/main/java/ru/mystamps/web/support/jdbc/package-info.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)