refactor(UserService): 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

@@ -31,6 +31,7 @@
 
 import lombok.RequiredArgsConstructor;
 
+import ru.mystamps.web.feature.account.UserService;
 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.UserService;
 import ru.mystamps.web.service.UsersActivationService;
 
 @Controller

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

@@ -15,12 +15,11 @@
  * 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 ru.mystamps.web.dao.dto.UserDetails;
-import ru.mystamps.web.feature.account.ActivateAccountDto;
 
 public interface UserService {
 	void registerUser(ActivateAccountDto dto);

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.account.UserService;
 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

@@ -36,6 +36,7 @@
 import ru.mystamps.web.dao.dto.UserDetails;
 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.collection.CollectionService;
 
 import static ru.mystamps.web.dao.dto.UserDetails.Role.USER;

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

@@ -22,7 +22,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.service.UserService;
+import ru.mystamps.web.feature.account.UserService;
 
 @RequiredArgsConstructor
 public class UniqueLoginValidator implements ConstraintValidator<UniqueLogin, String> {

src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java

@@ -35,7 +35,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.dto.UserDetails;
-import ru.mystamps.web.service.UserService;
+import ru.mystamps.web.feature.account.UserService;
 
 /**
  * Implementation of Spring's {@link UserDetailsService} which uses our DAO to load user.

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.account.UserService
 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

@@ -28,6 +28,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.account.ActivateAccountForm
+import ru.mystamps.web.feature.account.UserService
 import ru.mystamps.web.feature.collection.CollectionService
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.tests.Random