Skip to content

Commit 4fc7b63

Browse files
committed
Replace usage of UsersActivation.ACTIVATION_KEY_LENGTH by ValidationRules.ACT_KEY_LENGTH.
Addressed to #120 No functional changes.
1 parent 137ddf6 commit 4fc7b63

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;
3535
import ru.mystamps.web.dao.dto.UsersActivationDto;
3636
import ru.mystamps.web.service.dto.SendUsersActivationDto;
37-
import ru.mystamps.web.entity.UsersActivation;
3837
import ru.mystamps.web.service.dto.RegisterAccountDto;
3938
import ru.mystamps.web.support.togglz.Features;
4039
import ru.mystamps.web.util.LocaleUtils;
40+
import ru.mystamps.web.validation.ValidationRules;
4141

4242
@RequiredArgsConstructor
4343
public class UsersActivationServiceImpl implements UsersActivationService {
@@ -99,7 +99,7 @@ public long countByActivationKey(String activationKey) {
9999
* in 10 characters length
100100
**/
101101
private static String generateActivationKey() {
102-
int actKeyLength = UsersActivation.ACTIVATION_KEY_LENGTH;
102+
int actKeyLength = ValidationRules.ACT_KEY_LENGTH;
103103
return RandomStringUtils.randomAlphanumeric(actKeyLength).toLowerCase();
104104
}
105105

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import spock.lang.Unroll
2323
import ru.mystamps.web.dao.JdbcUsersActivationDao
2424
import ru.mystamps.web.dao.dto.AddUsersActivationDbDto
2525
import ru.mystamps.web.dao.dto.UsersActivationDto
26-
import ru.mystamps.web.entity.UsersActivation
2726
import ru.mystamps.web.model.RegisterAccountForm
2827
import ru.mystamps.web.service.dto.SendUsersActivationDto
2928
import ru.mystamps.web.tests.DateUtils
29+
import ru.mystamps.web.validation.ValidationRules
3030

3131
class UsersActivationServiceImplTest extends Specification {
3232

@@ -68,7 +68,7 @@ class UsersActivationServiceImplTest extends Specification {
6868
service.add(registrationForm, ANY_LOCALE)
6969
then:
7070
1 * usersActivationDao.add({ AddUsersActivationDbDto activation ->
71-
assert activation?.activationKey?.length() == UsersActivation.ACTIVATION_KEY_LENGTH
71+
assert activation?.activationKey?.length() == ValidationRules.ACT_KEY_LENGTH
7272
assert activation?.activationKey ==~ /^[\p{Lower}\p{Digit}]+$/
7373
return true
7474
})

0 commit comments

Comments
 (0)