CategoryService: move to ru.mystamps.web.feature.category package.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -30,7 +30,8 @@
 
 import lombok.RequiredArgsConstructor;
 
-// CheckStyle: ignore AvoidStarImportCheck for next 1 line
+// CheckStyle: ignore AvoidStarImportCheck for next 2 lines
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.service.*; // NOPMD: UnusedImports
 import ru.mystamps.web.support.spring.security.SecurityConfig;
 

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

@@ -38,7 +38,7 @@
 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.service.CategoryService;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;

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

@@ -70,7 +70,7 @@
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.service.CategoryService;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesImportService;

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

@@ -31,7 +31,7 @@
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesLinkDto;
 import ru.mystamps.web.dao.dto.SuspiciousActivityDto;
-import ru.mystamps.web.service.CategoryService;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;

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

@@ -31,7 +31,7 @@
 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.feature.category.CategoryService;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.util.LocaleUtils;
 

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

@@ -45,7 +45,6 @@
 import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;
 

src/main/java/ru/mystamps/web/service/CategoryService.java renamed to src/main/java/ru/mystamps/web/feature/category/CategoryService.java

@@ -15,14 +15,13 @@
  * 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.category;
 
 import java.util.Date;
 import java.util.List;
 
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
-import ru.mystamps.web.feature.category.AddCategoryDto;
 
 @SuppressWarnings("PMD.TooManyMethods")
 public interface CategoryService {

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

@@ -39,6 +39,7 @@
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.category.AddCategoryDto;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 import ru.mystamps.web.util.LocaleUtils;
 import ru.mystamps.web.util.SlugUtils;

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

@@ -34,6 +34,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.service.dto.AdminDailyReport;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 

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

@@ -40,6 +40,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.dto.Currency;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.service.dto.RawParsedDataDto;
 import ru.mystamps.web.service.dto.SeriesExtractedInfo;
 import ru.mystamps.web.validation.ValidationRules;

src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategoryNameValidator.java

@@ -22,7 +22,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.service.CategoryService;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.support.beanvalidation.UniqueCategoryName.Lang;
 
 @RequiredArgsConstructor

src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategorySlugValidator.java

@@ -22,7 +22,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.service.CategoryService;
+import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.util.SlugUtils;
 
 @RequiredArgsConstructor

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

@@ -32,6 +32,7 @@ import ru.mystamps.web.dao.dto.AddCategoryDbDto
 import ru.mystamps.web.dao.dto.EntityWithParentDto
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.feature.category.AddCategoryForm
+import ru.mystamps.web.feature.category.CategoryService
 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

@@ -22,6 +22,7 @@ import org.slf4j.helpers.NOPLogger
 import spock.lang.Specification
 
 import ru.mystamps.web.dao.dto.UsersActivationFullDto
+import ru.mystamps.web.feature.category.CategoryService
 import ru.mystamps.web.service.dto.AdminDailyReport
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])

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

@@ -31,6 +31,7 @@ import org.slf4j.helpers.NOPLogger
 import spock.lang.Specification
 import spock.lang.Unroll
 
+import ru.mystamps.web.feature.category.CategoryService
 import ru.mystamps.web.tests.Random
 import ru.mystamps.web.validation.ValidationRules