UsersActivationService.remove(): change argument from UsersActivation to String.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -67,7 +67,7 @@ public void purgeUsersActivations() {
 				activation.getCreatedAt()
 			);
 
-			usersActivationService.remove(activation);
+			usersActivationService.remove(activation.getActivationKey());
 		}
 	}
 

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

@@ -92,7 +92,7 @@ public void registerUser(ActivateAccountDto dto) {
 		user.setHash(hash);
 
 		user = userDao.save(user);
-		usersActivationService.remove(activation);
+		usersActivationService.remove(activation.getActivationKey());
 
 		LOG.info("User has been created ({})", user);
 

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

@@ -24,7 +24,7 @@
 
 public interface UsersActivationService {
 	void add(RegisterAccountDto dto, Locale lang);
-	void remove(UsersActivation activation);
+	void remove(String activationKey);
 	UsersActivation findByActivationKey(String activationKey);
 	long countByActivationKey(String activationKey);
 }

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

@@ -66,13 +66,12 @@ public void add(RegisterAccountDto dto, Locale lang) {
 
 	@Override
 	@Transactional
-	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");
+	public void remove(String activationKey) {
+		Validate.isTrue(activationKey != null, "Activation key must be non null");
 
-		usersActivationDao.removeByActivationKey(activation.getActivationKey());
+		usersActivationDao.removeByActivationKey(activationKey);
 
-		LOG.info("Users activation has been deleted ({})", activation);
+		LOG.info("Users activation '{}' has been deleted", activationKey);
 	}
 
 	@Override

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

@@ -69,7 +69,7 @@ class CronServiceImplTest extends Specification {
 		when:
 			service.purgeUsersActivations()
 		then:
-			1 * usersActivationService.remove(_ as UsersActivation)
+			1 * usersActivationService.remove(_ as String)
 	}
 
 	def "purgeUsersActivations() should do nothing if no activations"() {
@@ -78,7 +78,7 @@ class CronServiceImplTest extends Specification {
 		when:		
 			service.purgeUsersActivations()
 		then:
-			0 * usersActivationService.remove(_ as UsersActivation)
+			0 * usersActivationService.remove(_ as String)
 	}
 
 }

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

@@ -78,13 +78,14 @@ class UserServiceImplTest extends Specification {
 	def "registerUser() should delete registration request"() {
 		given:
 			UsersActivation expectedActivation = TestObjects.createUsersActivation()
+			String expectedActivationKey = expectedActivation.getActivationKey()
 		when:
 			service.registerUser(activationForm)
 		then:
 			usersActivationService.findByActivationKey(_ as String) >> expectedActivation
 		and:
-			1 * usersActivationService.remove({ UsersActivation actualActivation ->
-				assert actualActivation == expectedActivation
+			1 * usersActivationService.remove({ String actualActivationKey ->
+				assert actualActivationKey == expectedActivationKey
 				return true
 			})
 		and:

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

@@ -207,30 +207,20 @@ class UsersActivationServiceImplTest extends Specification {
 	// Tests for remove()
 	//
 
-	def "remove() should throw exception when argument is null"() {
-		when:
-			service.remove(null)
-		then:
-			thrown IllegalArgumentException
-	}
-	
 	def "remove() should throw exception when activation key is null"() {
-		given:
-			UsersActivation activation = TestObjects.createUsersActivation()
-			activation.setActivationKey(null)
 		when:
-			service.remove(activation)
+			service.remove(null)
 		then:
 			thrown IllegalArgumentException
 	}
 
 	def "remove() should pass argument to DAO method"() {
 		given:
-			UsersActivation activation = TestObjects.createUsersActivation()
+			String activationKey = TestObjects.createUsersActivation().getActivationKey()
 		when:
-			service.remove(activation)
+			service.remove(activationKey)
 		then:
-			1 * usersActivationDao.removeByActivationKey(activation.getActivationKey())
+			1 * usersActivationDao.removeByActivationKey(activationKey)
 	}
 
 }