RowMappers: move to ru.mystamps.web.support.jdbc package.

Required for #927 No functional changes.
php-coder · Jul 19, 2018 · d68eb07 · d68eb07
1 parent 721f6cb
commit d68eb07
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcCategoryDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcCategoryDao.java
@@ -38,6 +38,7 @@
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.category.AddCategoryDbDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 @SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods" })

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcCollectionDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcCollectionDao.java
@@ -44,6 +44,7 @@
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInCollectionDto;
 import ru.mystamps.web.dao.dto.SeriesInCollectionWithPriceDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 @SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods" })

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDao.java
@@ -37,6 +37,7 @@
 import ru.mystamps.web.dao.CountryDao;
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 @SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods", "PMD.TooManyFields" })

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcImageDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcImageDao.java
@@ -35,6 +35,7 @@
 
 import ru.mystamps.web.dao.ImageDao;
 import ru.mystamps.web.dao.dto.ImageInfoDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 public class JdbcImageDao implements ImageDao {

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcImageDataDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcImageDataDao.java
@@ -34,6 +34,7 @@
 import ru.mystamps.web.dao.ImageDataDao;
 import ru.mystamps.web.dao.dto.AddImageDataDbDto;
 import ru.mystamps.web.dao.dto.DbImageDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 public class JdbcImageDataDao implements ImageDataDao {

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDao.java
@@ -41,6 +41,7 @@
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.dao.dto.SeriesLinkDto;
 import ru.mystamps.web.dao.dto.SitemapInfoDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 // TODO: move stamps related methods to separate interface (#88)
 @SuppressWarnings({

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesImportDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesImportDao.java
@@ -41,6 +41,7 @@
 import ru.mystamps.web.dao.dto.ImportRequestInfo;
 import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
 import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 // it complains that "request_id" is present many times
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesSalesImportDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesSalesImportDao.java
@@ -35,6 +35,7 @@
 import ru.mystamps.web.dao.SeriesSalesImportDao;
 import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
 import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 public class JdbcSeriesSalesImportDao implements SeriesSalesImportDao {

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcSuspiciousActivityDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcSuspiciousActivityDao.java
@@ -33,6 +33,7 @@
 import ru.mystamps.web.dao.SuspiciousActivityDao;
 import ru.mystamps.web.dao.dto.AddSuspiciousActivityDbDto;
 import ru.mystamps.web.dao.dto.SuspiciousActivityDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 public class JdbcSuspiciousActivityDao implements SuspiciousActivityDao {

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcTransactionParticipantDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcTransactionParticipantDao.java
@@ -37,6 +37,7 @@
 import ru.mystamps.web.dao.dto.AddParticipantDbDto;
 import ru.mystamps.web.dao.dto.EntityWithIdDto;
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 public class JdbcTransactionParticipantDao implements TransactionParticipantDao {

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcUserDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcUserDao.java
@@ -36,6 +36,7 @@
 import ru.mystamps.web.dao.UserDao;
 import ru.mystamps.web.dao.dto.AddUserDbDto;
 import ru.mystamps.web.dao.dto.UserDetails;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @RequiredArgsConstructor
 public class JdbcUserDao implements UserDao {

diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcUsersActivationDao.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcUsersActivationDao.java
@@ -34,6 +34,7 @@
 import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;
 import ru.mystamps.web.dao.dto.UsersActivationDto;
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
+import ru.mystamps.web.support.jdbc.RowMappers;
 
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @RequiredArgsConstructor

diff --git a/.../ru/mystamps/web/dao/impl/RowMappers.java → ...mystamps/web/support/jdbc/RowMappers.java b/.../ru/mystamps/web/dao/impl/RowMappers.java → ...mystamps/web/support/jdbc/RowMappers.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.dao.impl;
+package ru.mystamps.web.support.jdbc;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -24,13 +24,14 @@
 
 // CheckStyle: ignore AvoidStarImportCheck for next 1 line
 import ru.mystamps.web.dao.dto.*; // NOPMD: UnusedImports
+import ru.mystamps.web.dao.impl.JdbcUtils;
 
 @SuppressWarnings({
 	"PMD.AvoidDuplicateLiterals",
 	"PMD.TooManyMethods",
 	"PMD.CouplingBetweenObjects"
 })
-final class RowMappers {
+public final class RowMappers {
 
 	private RowMappers() {
 	}

diff --git a/src/main/java/ru/mystamps/web/support/jdbc/package-info.java b/src/main/java/ru/mystamps/web/support/jdbc/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Helpers and shared code for simplify a working with JDBC.
+ */
+package ru.mystamps.web.support.jdbc;