UsersActivationServiceImpl: rename a member.

No functional changes.

Author: php-coder

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

@@ -40,7 +40,7 @@
 public class UsersActivationServiceImpl implements UsersActivationService {
 	private static final Logger LOG = LoggerFactory.getLogger(UsersActivationServiceImpl.class);
 
-	private final JdbcUsersActivationDao jdbcUsersActivationDao;
+	private final JdbcUsersActivationDao usersActivationDao;
 	private final MailService mailService;
 
 	@Override
@@ -55,7 +55,7 @@ public void add(RegisterAccountDto dto, Locale lang) {
 		activation.setEmail(dto.getEmail());
 		activation.setLang(LocaleUtils.getLanguageOrDefault(lang, "en"));
 		activation.setCreatedAt(new Date());
-		jdbcUsersActivationDao.add(activation);
+		usersActivationDao.add(activation);
 
 		LOG.info("Users activation has been created ({})", activation);
 
@@ -70,7 +70,7 @@ public void remove(UsersActivation activation) {
 		Validate.isTrue(activation != null, "Activation must be non null");
 		Validate.isTrue(activation.getActivationKey() != null, "Activation key must be non null");
 
-		jdbcUsersActivationDao.removeByActivationKey(activation.getActivationKey());
+		usersActivationDao.removeByActivationKey(activation.getActivationKey());
 
 		LOG.info("Users activation has been deleted ({})", activation);
 	}
@@ -80,15 +80,15 @@ public void remove(UsersActivation activation) {
 	public UsersActivation findByActivationKey(String activationKey) {
 		Validate.isTrue(activationKey != null, "Activation key must be non null");
 
-		return jdbcUsersActivationDao.findByActivationKey(activationKey);
+		return usersActivationDao.findByActivationKey(activationKey);
 	}
 
 	@Override
 	@Transactional(readOnly = true)
 	public long countByActivationKey(String activationKey) {
 		Validate.isTrue(activationKey != null, "Activation key should be non null");
 
-		return jdbcUsersActivationDao.countByActivationKey(activationKey);
+		return usersActivationDao.countByActivationKey(activationKey);
 	}
 
 	/**

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

@@ -27,7 +27,7 @@ import ru.mystamps.web.tests.DateUtils
 
 class UsersActivationServiceImplTest extends Specification {
 
-	private JdbcUsersActivationDao jdbcUsersActivationDao = Mock()
+	private JdbcUsersActivationDao usersActivationDao = Mock()
 	private MailService mailService = Mock()
 
 	private UsersActivationService service
@@ -39,7 +39,7 @@ class UsersActivationServiceImplTest extends Specification {
 		registrationForm = new RegisterAccountForm()
 		registrationForm.setEmail('john.dou@example.org')
 
-		service = new UsersActivationServiceImpl(jdbcUsersActivationDao, mailService)
+		service = new UsersActivationServiceImpl(usersActivationDao, mailService)
 	}
 
 	//
@@ -57,14 +57,14 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * jdbcUsersActivationDao.add(_ as UsersActivation)
+			1 * usersActivationDao.add(_ as UsersActivation)
 	}
 
 	def "add() should generate activation key"() {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * jdbcUsersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ UsersActivation activation ->
 				assert activation?.activationKey?.length() == UsersActivation.ACTIVATION_KEY_LENGTH
 				assert activation?.activationKey ==~ /^[\p{Lower}\p{Digit}]+$/
 				return true
@@ -78,7 +78,7 @@ class UsersActivationServiceImplTest extends Specification {
 			service.add(registrationForm, ANY_LOCALE)
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			2 * jdbcUsersActivationDao.add({ UsersActivation activation ->
+			2 * usersActivationDao.add({ UsersActivation activation ->
 				passedArguments.add(activation?.activationKey)
 				return true
 			})
@@ -110,7 +110,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * jdbcUsersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ UsersActivation activation ->
 				assert activation?.email == expectedEmail
 				return true
 			})
@@ -121,7 +121,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, lang)
 		then:
-			1 * jdbcUsersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ UsersActivation activation ->
 				assert activation?.lang == expectedLang
 				return true
 			})
@@ -135,7 +135,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * jdbcUsersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ UsersActivation activation ->
 				assert DateUtils.roughlyEqual(activation?.createdAt, new Date())
 				return true
 			})
@@ -167,7 +167,7 @@ class UsersActivationServiceImplTest extends Specification {
 
 	def "countByActivationKey() should call dao"() {
 		given:
-			jdbcUsersActivationDao.countByActivationKey(_ as String) >> 2L
+			usersActivationDao.countByActivationKey(_ as String) >> 2L
 		when:
 			long result = service.countByActivationKey('0123456789')
 		then:
@@ -178,7 +178,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.countByActivationKey('0987654321')
 		then:
-			1 * jdbcUsersActivationDao.countByActivationKey('0987654321')
+			1 * usersActivationDao.countByActivationKey('0987654321')
 	}
 
 	//
@@ -198,7 +198,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			UsersActivation result = service.findByActivationKey("0987654321")
 		then:
-			1 * jdbcUsersActivationDao.findByActivationKey("0987654321") >> expectedResult
+			1 * usersActivationDao.findByActivationKey("0987654321") >> expectedResult
 		and:
 			result == expectedResult
 	}
@@ -230,7 +230,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.remove(activation)
 		then:
-			1 * jdbcUsersActivationDao.removeByActivationKey(activation.getActivationKey())
+			1 * usersActivationDao.removeByActivationKey(activation.getActivationKey())
 	}
 
 }