refactor(UsersActivationService): move to ru.mystamps.web.feature.account package.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -32,6 +32,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.feature.account.UserService;
+import ru.mystamps.web.feature.account.UsersActivationService;
 import ru.mystamps.web.feature.category.CategoryConfig;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.collection.CollectionConfig;

src/main/java/ru/mystamps/web/feature/account/AccountController.java

@@ -47,7 +47,6 @@
 import ru.mystamps.web.feature.account.ActivateAccountForm.NameChecks;
 import ru.mystamps.web.feature.account.ActivateAccountForm.PasswordChecks;
 import ru.mystamps.web.feature.account.ActivateAccountForm.PasswordConfirmationChecks;
-import ru.mystamps.web.service.UsersActivationService;
 
 @Controller
 @RequiredArgsConstructor

src/main/java/ru/mystamps/web/service/UsersActivationService.java renamed to src/main/java/ru/mystamps/web/feature/account/UsersActivationService.java

@@ -15,15 +15,14 @@
  * 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.account;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
 import ru.mystamps.web.dao.dto.UsersActivationDto;
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
-import ru.mystamps.web.feature.account.RegisterAccountDto;
 
 public interface UsersActivationService {
 	void add(RegisterAccountDto dto, Locale lang);

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.account.UserService;
+import ru.mystamps.web.feature.account.UsersActivationService;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.feature.country.CountryService;

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

@@ -37,6 +37,7 @@
 import ru.mystamps.web.dao.dto.UsersActivationDto;
 import ru.mystamps.web.feature.account.ActivateAccountDto;
 import ru.mystamps.web.feature.account.UserService;
+import ru.mystamps.web.feature.account.UsersActivationService;
 import ru.mystamps.web.feature.collection.CollectionService;
 
 import static ru.mystamps.web.dao.dto.UserDetails.Role.USER;

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

@@ -36,6 +36,7 @@
 import ru.mystamps.web.dao.dto.UsersActivationDto;
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
 import ru.mystamps.web.feature.account.RegisterAccountDto;
+import ru.mystamps.web.feature.account.UsersActivationService;
 import ru.mystamps.web.service.dto.SendUsersActivationDto;
 import ru.mystamps.web.support.togglz.Features;
 import ru.mystamps.web.util.LocaleUtils;

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

@@ -22,7 +22,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.service.UsersActivationService;
+import ru.mystamps.web.feature.account.UsersActivationService;
 
 @RequiredArgsConstructor
 public class ExistingActivationKeyValidator

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.account.UserService
+import ru.mystamps.web.feature.account.UsersActivationService
 import ru.mystamps.web.feature.category.CategoryService
 import ru.mystamps.web.feature.collection.CollectionService
 import ru.mystamps.web.feature.country.CountryService

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

@@ -29,6 +29,7 @@ import ru.mystamps.web.dao.dto.UserDetails
 import ru.mystamps.web.dao.dto.UsersActivationDto
 import ru.mystamps.web.feature.account.ActivateAccountForm
 import ru.mystamps.web.feature.account.UserService
+import ru.mystamps.web.feature.account.UsersActivationService
 import ru.mystamps.web.feature.collection.CollectionService
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.tests.Random

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

@@ -27,6 +27,7 @@ import ru.mystamps.web.dao.dto.AddUsersActivationDbDto
 import ru.mystamps.web.dao.dto.UsersActivationDto
 import ru.mystamps.web.dao.dto.UsersActivationFullDto
 import ru.mystamps.web.feature.account.RegisterAccountForm
+import ru.mystamps.web.feature.account.UsersActivationService
 import ru.mystamps.web.service.dto.SendUsersActivationDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.validation.ValidationRules