Move some DTO classes from service.dto to dao.dto package.

Addressed to #120

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/controller/CategoryController.java

@@ -40,11 +40,11 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.model.AddCategoryForm;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.SeriesService;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
 import ru.mystamps.web.util.LocaleUtils;
 
 @Controller

src/main/java/ru/mystamps/web/controller/CollectionController.java

@@ -33,11 +33,11 @@
 
 import ru.mystamps.web.Url;
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
+import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;
-import ru.mystamps.web.service.dto.SeriesInfoDto;
 import ru.mystamps.web.util.LocaleUtils;
 
 @Controller

src/main/java/ru/mystamps/web/controller/CountryController.java

@@ -43,11 +43,11 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.model.AddCountryForm;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
 import ru.mystamps.web.util.LocaleUtils;
 
 @Controller

src/main/java/ru/mystamps/web/controller/ImageController.java

@@ -28,8 +28,8 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
+import ru.mystamps.web.dao.dto.ImageDto;
 import ru.mystamps.web.service.ImageService;
-import ru.mystamps.web.service.dto.ImageDto;
 
 @Controller
 @RequiredArgsConstructor

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -53,17 +53,17 @@
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
+import ru.mystamps.web.dao.dto.SeriesInfoDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.model.AddImageForm;
 import ru.mystamps.web.model.AddSeriesForm;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
 import ru.mystamps.web.service.dto.SeriesDto;
-import ru.mystamps.web.service.dto.SeriesInfoDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
 import ru.mystamps.web.support.spring.security.Authority;
 import ru.mystamps.web.support.spring.security.SecurityContextUtils;
 import ru.mystamps.web.util.CatalogUtils;

src/main/java/ru/mystamps/web/controller/SitemapController.java

@@ -34,8 +34,8 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
+import ru.mystamps.web.dao.dto.SitemapInfoDto;
 import ru.mystamps.web.service.SeriesService;
-import ru.mystamps.web.service.dto.SitemapInfoDto;
 
 @Controller
 @RequiredArgsConstructor

src/main/java/ru/mystamps/web/controller/converter/LinkEntityDtoGenericConverter.java

@@ -30,9 +30,9 @@
 
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.Country;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.CountryService;
-import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.util.LocaleUtils;
 
 @RequiredArgsConstructor

src/main/java/ru/mystamps/web/dao/JdbcCategoryDao.java

@@ -20,8 +20,8 @@
 import java.util.List;
 
 import ru.mystamps.web.dao.dto.AddCategoryDbDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
 
 public interface JdbcCategoryDao {
 	Integer add(AddCategoryDbDto category);

src/main/java/ru/mystamps/web/dao/JdbcCollectionDao.java

@@ -19,8 +19,8 @@
 
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 
 public interface JdbcCollectionDao {
 	Iterable<LinkEntityDto> findLastCreated(int quantity);

src/main/java/ru/mystamps/web/dao/JdbcCountryDao.java

@@ -20,8 +20,8 @@
 import java.util.List;
 
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
 
 public interface JdbcCountryDao {
 	Integer add(AddCountryDbDto country);

src/main/java/ru/mystamps/web/dao/JdbcImageDao.java

@@ -19,7 +19,7 @@
 
 import java.util.List;
 
-import ru.mystamps.web.service.dto.ImageInfoDto;
+import ru.mystamps.web.dao.dto.ImageInfoDto;
 
 public interface JdbcImageDao {
 	Integer add(String type);

src/main/java/ru/mystamps/web/dao/JdbcImageDataDao.java

@@ -18,7 +18,7 @@
 package ru.mystamps.web.dao;
 
 import ru.mystamps.web.dao.dto.AddImageDataDbDto;
-import ru.mystamps.web.service.dto.DbImageDto;
+import ru.mystamps.web.dao.dto.DbImageDto;
 
 public interface JdbcImageDataDao {
 	DbImageDto findByImageId(Integer imageId);

src/main/java/ru/mystamps/web/dao/JdbcSeriesDao.java

@@ -22,8 +22,8 @@
 
 import ru.mystamps.web.dao.dto.AddSeriesDbDto;
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
-import ru.mystamps.web.service.dto.SeriesInfoDto;
-import ru.mystamps.web.service.dto.SitemapInfoDto;
+import ru.mystamps.web.dao.dto.SeriesInfoDto;
+import ru.mystamps.web.dao.dto.SitemapInfoDto;
 
 // TODO: move stamps related methods to separate interface (#88)
 @SuppressWarnings("PMD.TooManyMethods")

src/main/java/ru/mystamps/web/service/dto/DbImageDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/DbImageDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/ru/mystamps/web/service/dto/ImageDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/ImageDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 public interface ImageDto {
 	String getType();

src/main/java/ru/mystamps/web/service/dto/ImageInfoDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/ImageInfoDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/ru/mystamps/web/service/dto/LinkEntityDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/LinkEntityDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/ru/mystamps/web/service/dto/SelectEntityDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/SelectEntityDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/ru/mystamps/web/dao/dto/SeriesFullInfoDto.java

@@ -22,8 +22,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.service.dto.LinkEntityDto;
-
 @Getter
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.TooManyFields")

src/main/java/ru/mystamps/web/service/dto/SeriesInfoDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/SeriesInfoDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 import lombok.Getter;
 

src/main/java/ru/mystamps/web/service/dto/SitemapInfoDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/SitemapInfoDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 import java.util.Date;
 

src/main/java/ru/mystamps/web/service/dto/UrlEntityDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/UrlEntityDto.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.service.dto;
+package ru.mystamps.web.dao.dto;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/ru/mystamps/web/dao/impl/JdbcCategoryDaoImpl.java

@@ -35,8 +35,8 @@
 
 import ru.mystamps.web.dao.JdbcCategoryDao;
 import ru.mystamps.web.dao.dto.AddCategoryDbDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
 
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")

src/main/java/ru/mystamps/web/dao/impl/JdbcCollectionDaoImpl.java

@@ -37,8 +37,8 @@
 import ru.mystamps.web.dao.JdbcCollectionDao;
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")

src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDaoImpl.java

@@ -35,8 +35,8 @@
 
 import ru.mystamps.web.dao.JdbcCountryDao;
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
 
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")

src/main/java/ru/mystamps/web/dao/impl/JdbcImageDaoImpl.java

@@ -34,7 +34,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcImageDao;
-import ru.mystamps.web.service.dto.ImageInfoDto;
+import ru.mystamps.web.dao.dto.ImageInfoDto;
 
 @RequiredArgsConstructor
 public class JdbcImageDaoImpl implements JdbcImageDao {

src/main/java/ru/mystamps/web/dao/impl/JdbcImageDataDaoImpl.java

@@ -34,7 +34,7 @@
 
 import ru.mystamps.web.dao.JdbcImageDataDao;
 import ru.mystamps.web.dao.dto.AddImageDataDbDto;
-import ru.mystamps.web.service.dto.DbImageDto;
+import ru.mystamps.web.dao.dto.DbImageDto;
 
 @RequiredArgsConstructor
 public class JdbcImageDataDaoImpl implements JdbcImageDataDao {

src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDaoImpl.java

@@ -37,8 +37,8 @@
 import ru.mystamps.web.dao.JdbcSeriesDao;
 import ru.mystamps.web.dao.dto.AddSeriesDbDto;
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
-import ru.mystamps.web.service.dto.SeriesInfoDto;
-import ru.mystamps.web.service.dto.SitemapInfoDto;
+import ru.mystamps.web.dao.dto.SeriesInfoDto;
+import ru.mystamps.web.dao.dto.SitemapInfoDto;
 
 // TODO: move stamps related methods to separate interface (#88)
 @SuppressWarnings({

src/main/java/ru/mystamps/web/dao/impl/RowMappers.java

@@ -23,18 +23,18 @@
 import java.util.Date;
 
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
+import ru.mystamps.web.dao.dto.DbImageDto;
+import ru.mystamps.web.dao.dto.ImageInfoDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
+import ru.mystamps.web.dao.dto.SeriesInfoDto;
+import ru.mystamps.web.dao.dto.SitemapInfoDto;
 import ru.mystamps.web.dao.dto.SuspiciousActivityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.dao.dto.UserDetails;
 import ru.mystamps.web.dao.dto.UsersActivationDto;
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
-import ru.mystamps.web.service.dto.DbImageDto;
-import ru.mystamps.web.service.dto.ImageInfoDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
-import ru.mystamps.web.service.dto.SeriesInfoDto;
-import ru.mystamps.web.service.dto.SitemapInfoDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
 
 @SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods" })
 final class RowMappers {

src/main/java/ru/mystamps/web/model/AddSeriesForm.java

@@ -34,8 +34,8 @@
 
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.Country;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.AddSeriesDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.validation.jsr303.CatalogNumbers;
 import ru.mystamps.web.validation.jsr303.ImageFile;
 import ru.mystamps.web.validation.jsr303.MaxFileSize;

src/main/java/ru/mystamps/web/service/CategoryService.java

@@ -19,10 +19,10 @@
 
 import java.util.List;
 
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.service.dto.AddCategoryDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
 
 public interface CategoryService {
 	UrlEntityDto add(AddCategoryDto dto, Integer userId);

src/main/java/ru/mystamps/web/service/CategoryServiceImpl.java

@@ -34,10 +34,10 @@
 
 import ru.mystamps.web.dao.JdbcCategoryDao;
 import ru.mystamps.web.dao.dto.AddCategoryDbDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.SelectEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.service.dto.AddCategoryDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 import ru.mystamps.web.util.SlugUtils;
 

src/main/java/ru/mystamps/web/service/CollectionService.java

@@ -18,8 +18,8 @@
 package ru.mystamps.web.service;
 
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 
 public interface CollectionService {
 	void createCollection(Integer ownerId, String ownerLogin);

src/main/java/ru/mystamps/web/service/CollectionServiceImpl.java

@@ -32,8 +32,8 @@
 import ru.mystamps.web.dao.JdbcCollectionDao;
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 import ru.mystamps.web.util.SlugUtils;
 

src/main/java/ru/mystamps/web/service/CountryService.java

@@ -19,9 +19,9 @@
 
 import java.util.List;
 
+import ru.mystamps.web.dao.dto.LinkEntityDto;
+import ru.mystamps.web.dao.dto.UrlEntityDto;
 import ru.mystamps.web.service.dto.AddCountryDto;
-import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.UrlEntityDto;
 
 public interface CountryService {
 	UrlEntityDto add(AddCountryDto dto, Integer userId);