SeriesInCollectionWithPriceDto: move to ru.mystamps.web.feature.collection package.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -37,7 +37,6 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
 import ru.mystamps.web.dao.dto.SeriesInCollectionDto;
-import ru.mystamps.web.dao.dto.SeriesInCollectionWithPriceDto;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.service.SeriesService;

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

@@ -23,7 +23,6 @@
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInCollectionDto;
-import ru.mystamps.web.dao.dto.SeriesInCollectionWithPriceDto;
 
 @SuppressWarnings("PMD.TooManyMethods")
 public interface CollectionDao {

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

@@ -23,7 +23,6 @@
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInCollectionDto;
-import ru.mystamps.web.dao.dto.SeriesInCollectionWithPriceDto;
 
 public interface CollectionService {
 	void createCollection(Integer ownerId, String ownerLogin);

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

@@ -34,7 +34,6 @@
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
 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.spring.security.HasAuthority;
 import ru.mystamps.web.util.SlugUtils;
 

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

@@ -40,7 +40,6 @@
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
 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

src/main/java/ru/mystamps/web/dao/dto/SeriesInCollectionWithPriceDto.java renamed to src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionWithPriceDto.java

@@ -15,13 +15,15 @@
  * 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.dto;
+package ru.mystamps.web.feature.collection;
 
 import java.math.BigDecimal;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import ru.mystamps.web.dao.dto.Currency;
+
 @Getter
 @RequiredArgsConstructor
 public class SeriesInCollectionWithPriceDto {

src/main/java/ru/mystamps/web/support/jdbc/RowMappers.java

@@ -24,6 +24,7 @@
 
 // CheckStyle: ignore AvoidStarImportCheck for next 1 line
 import ru.mystamps.web.dao.dto.*; // NOPMD: UnusedImports
+import ru.mystamps.web.feature.collection.SeriesInCollectionWithPriceDto;
 
 @SuppressWarnings({
 	"PMD.AvoidDuplicateLiterals",

src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy

@@ -27,7 +27,6 @@ import org.slf4j.helpers.NOPLogger
 
 import ru.mystamps.web.dao.dto.CollectionInfoDto
 import ru.mystamps.web.dao.dto.Currency
-import ru.mystamps.web.dao.dto.SeriesInCollectionWithPriceDto
 import ru.mystamps.web.service.TestObjects
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.tests.Random

src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -28,6 +28,7 @@
 import ru.mystamps.web.dao.dto.*;
 import ru.mystamps.web.feature.collection.AddToCollectionDto;
 import ru.mystamps.web.feature.collection.AddToCollectionForm;
+import ru.mystamps.web.feature.collection.SeriesInCollectionWithPriceDto;
 import ru.mystamps.web.feature.participant.AddParticipantDto;
 import ru.mystamps.web.feature.participant.AddParticipantForm;
 import ru.mystamps.web.service.dto.AddSeriesDto;