CountryService: move to ru.mystamps.web.feature.country 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.country.CountryService;
 // CheckStyle: ignore AvoidStarImportCheck for next 1 line
 import ru.mystamps.web.service.*; // NOPMD: UnusedImports
 import ru.mystamps.web.support.spring.security.SecurityConfig;

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

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

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

@@ -71,8 +71,8 @@
 import ru.mystamps.web.feature.category.Category;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.Country;
+import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.service.CollectionService;
-import ru.mystamps.web.service.CountryService;
 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.country.CountryService;
 import ru.mystamps.web.service.CollectionService;
-import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.service.SuspiciousActivityService;
 import ru.mystamps.web.util.LocaleUtils;

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

@@ -25,7 +25,7 @@
 
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
-import ru.mystamps.web.service.CountryService;
+import ru.mystamps.web.feature.country.CountryService;
 
 @Controller
 @RequiredArgsConstructor

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

@@ -32,7 +32,7 @@
 import ru.mystamps.web.feature.category.Category;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.Country;
-import ru.mystamps.web.service.CountryService;
+import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.util.LocaleUtils;
 
 @RequiredArgsConstructor

src/main/java/ru/mystamps/web/feature/country/CountryController.java

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

src/main/java/ru/mystamps/web/service/CountryService.java renamed to src/main/java/ru/mystamps/web/feature/country/CountryService.java

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

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

@@ -38,6 +38,7 @@
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.country.AddCountryDto;
+import ru.mystamps.web.feature.country.CountryService;
 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

@@ -35,6 +35,7 @@
 
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
 import ru.mystamps.web.feature.category.CategoryService;
+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/SeriesInfoExtractorServiceImpl.java

@@ -41,6 +41,7 @@
 
 import ru.mystamps.web.dao.dto.Currency;
 import ru.mystamps.web.feature.category.CategoryService;
+import ru.mystamps.web.feature.country.CountryService;
 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/UniqueCountryNameValidator.java

@@ -22,7 +22,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.service.CountryService;
+import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.support.beanvalidation.UniqueCountryName.Lang;
 
 @RequiredArgsConstructor

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

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

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

@@ -31,6 +31,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.feature.country.AddCountryForm
+import ru.mystamps.web.feature.country.CountryService
 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.country.CountryService
 import ru.mystamps.web.service.dto.AdminDailyReport
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])

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

@@ -32,6 +32,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 import ru.mystamps.web.feature.category.CategoryService
+import ru.mystamps.web.feature.country.CountryService
 import ru.mystamps.web.tests.Random
 import ru.mystamps.web.validation.ValidationRules