File tree 2 files changed +4
-4
lines changed
main/java/ru/mystamps/web/service
test/groovy/ru/mystamps/web/service 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 34
34
import ru .mystamps .web .dao .dto .AddUsersActivationDbDto ;
35
35
import ru .mystamps .web .dao .dto .UsersActivationDto ;
36
36
import ru .mystamps .web .service .dto .SendUsersActivationDto ;
37
- import ru .mystamps .web .entity .UsersActivation ;
38
37
import ru .mystamps .web .service .dto .RegisterAccountDto ;
39
38
import ru .mystamps .web .support .togglz .Features ;
40
39
import ru .mystamps .web .util .LocaleUtils ;
40
+ import ru .mystamps .web .validation .ValidationRules ;
41
41
42
42
@ RequiredArgsConstructor
43
43
public class UsersActivationServiceImpl implements UsersActivationService {
@@ -99,7 +99,7 @@ public long countByActivationKey(String activationKey) {
99
99
* in 10 characters length
100
100
**/
101
101
private static String generateActivationKey () {
102
- int actKeyLength = UsersActivation . ACTIVATION_KEY_LENGTH ;
102
+ int actKeyLength = ValidationRules . ACT_KEY_LENGTH ;
103
103
return RandomStringUtils .randomAlphanumeric (actKeyLength ).toLowerCase ();
104
104
}
105
105
Original file line number Diff line number Diff line change @@ -23,10 +23,10 @@ import spock.lang.Unroll
23
23
import ru.mystamps.web.dao.JdbcUsersActivationDao
24
24
import ru.mystamps.web.dao.dto.AddUsersActivationDbDto
25
25
import ru.mystamps.web.dao.dto.UsersActivationDto
26
- import ru.mystamps.web.entity.UsersActivation
27
26
import ru.mystamps.web.model.RegisterAccountForm
28
27
import ru.mystamps.web.service.dto.SendUsersActivationDto
29
28
import ru.mystamps.web.tests.DateUtils
29
+ import ru.mystamps.web.validation.ValidationRules
30
30
31
31
class UsersActivationServiceImplTest extends Specification {
32
32
@@ -68,7 +68,7 @@ class UsersActivationServiceImplTest extends Specification {
68
68
service. add(registrationForm, ANY_LOCALE )
69
69
then :
70
70
1 * usersActivationDao. add({ AddUsersActivationDbDto activation ->
71
- assert activation?. activationKey?. length() == UsersActivation . ACTIVATION_KEY_LENGTH
71
+ assert activation?. activationKey?. length() == ValidationRules . ACT_KEY_LENGTH
72
72
assert activation?. activationKey ==~ / ^[\p {Lower}\p {Digit}]+$/
73
73
return true
74
74
})
You can’t perform that action at this time.
0 commit comments