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

Addressed to #927

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/ServicesConfig.java

@@ -33,6 +33,7 @@
 
 import ru.mystamps.web.feature.category.CategoryConfig;
 import ru.mystamps.web.feature.category.CategoryService;
+import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.feature.country.CountryConfig;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.participant.ParticipantConfig;

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

@@ -70,10 +70,10 @@
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.feature.category.Category;
 import ru.mystamps.web.feature.category.CategoryService;
+import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.feature.country.Country;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.participant.ParticipantService;
-import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.SeriesImportService;
 import ru.mystamps.web.service.SeriesSalesService;
 import ru.mystamps.web.service.SeriesService;

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

@@ -32,8 +32,8 @@
 import ru.mystamps.web.dao.dto.SeriesLinkDto;
 import ru.mystamps.web.dao.dto.SuspiciousActivityDto;
 import ru.mystamps.web.feature.category.CategoryService;
+import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.feature.country.CountryService;
-import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.service.SuspiciousActivityService;
 import ru.mystamps.web.util.LocaleUtils;

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

@@ -40,7 +40,6 @@
 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.CollectionService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;
 

src/main/java/ru/mystamps/web/service/CollectionService.java renamed to src/main/java/ru/mystamps/web/feature/collection/CollectionService.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;
+package ru.mystamps.web.feature.collection;
 
 import java.util.Date;
 import java.util.List;

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

@@ -38,6 +38,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.feature.collection.CollectionService;
 import ru.mystamps.web.service.dto.AddToCollectionDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 import ru.mystamps.web.util.SlugUtils;

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

@@ -35,6 +35,7 @@
 
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
 import ru.mystamps.web.feature.category.CategoryService;
+import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.service.dto.AdminDailyReport;
 import ru.mystamps.web.support.spring.security.HasAuthority;

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

@@ -35,6 +35,7 @@
 import ru.mystamps.web.dao.dto.AddUserDbDto;
 import ru.mystamps.web.dao.dto.UserDetails;
 import ru.mystamps.web.dao.dto.UsersActivationDto;
+import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.service.dto.ActivateAccountDto;
 
 import static ru.mystamps.web.dao.dto.UserDetails.Role.USER;

src/test/groovy/ru/mystamps/web/service/CollectionServiceImplTest.groovy

@@ -32,6 +32,7 @@ import ru.mystamps.web.dao.dto.AddToCollectionDbDto
 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.feature.collection.CollectionService
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.tests.Random
 import ru.mystamps.web.util.SlugUtils

src/test/groovy/ru/mystamps/web/service/CronServiceImplTest.groovy

@@ -23,6 +23,7 @@ import spock.lang.Specification
 
 import ru.mystamps.web.dao.dto.UsersActivationFullDto
 import ru.mystamps.web.feature.category.CategoryService
+import ru.mystamps.web.feature.collection.CollectionService
 import ru.mystamps.web.feature.country.CountryService
 import ru.mystamps.web.service.dto.AdminDailyReport