Use Preconditions.checkArgument() from Google Guava.

Also added Google Guava library to project dependencies.

No functional changes.

Author: php-coder

pom.xml

@@ -203,6 +203,12 @@
 			<version>2.0.8</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>r09</version>
+		</dependency>
+		
 	</dependencies>
 
 	<build>

src/main/config/checkstyle-suppressions.xml

@@ -6,7 +6,7 @@
 <suppressions>
 
 	<suppress checks="LineLength" files="AbstractPageWithForm.java" lines="27,28,33" />
-	<suppress checks="LineLength" files="Form.java" lines="30,31,36" />
+	<suppress checks="LineLength" files="Form.java" lines="32,33,38" />
 
 	<!-- false positives due to Lombok usage -->
 	<suppress checks="HideUtilityClassConstructor" files="ru.mystamps.web.model" />

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

@@ -29,6 +29,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import ru.mystamps.web.dao.SuspiciousActivityDao;
 import ru.mystamps.web.dao.SuspiciousActivityTypeDao;
 import ru.mystamps.web.dao.UserDao;
@@ -79,13 +81,8 @@ private void log(
 			final String referer,
 			final String agent) {
 
-		if (type == null) {
-			throw new IllegalArgumentException("Type of suspicious activity was not set");
-		}
-		
-		if (page == null) {
-			throw new IllegalArgumentException("Page should be non null");
-		}
+		checkArgument(type != null, "Type of suspicious activity was not set");
+		checkArgument(page != null, "Page should be non null");
 
 		final SuspiciousActivity activity = new SuspiciousActivity();
 		activity.setType(type);

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

@@ -31,6 +31,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.entity.UsersActivation;
 import ru.mystamps.web.dao.UserDao;
@@ -49,9 +51,7 @@ public class UserService {
 
 	@Transactional
 	public void addRegistrationRequest(final String email) {
-		if (email == null) {
-			throw new IllegalArgumentException("Email should be non null");
-		}
+		checkArgument(email != null, "Email should be non null");
 
 		final UsersActivation activation = new UsersActivation();
 
@@ -65,9 +65,7 @@ public void addRegistrationRequest(final String email) {
 	public UsersActivation findRegistrationRequestByActivationKey(
 			final String activationKey) {
 
-		if (activationKey == null) {
-			throw new IllegalArgumentException("Activation key should be non null");
-		}
+		checkArgument(activationKey != null, "Activation key should be non null");
 
 		return usersActivation.findByActivationKey(activationKey);
 	}
@@ -76,21 +74,10 @@ public UsersActivation findRegistrationRequestByActivationKey(
 	public void registerUser(final String login, final String password,
 			final String name, final String activationKey) {
 
-		if (login == null) {
-			throw new IllegalArgumentException("Login should be non null");
-		}
-		
-		if (password == null) {
-			throw new IllegalArgumentException("Password should be non null");
-		}
-		
-		if (name == null) {
-			throw new IllegalArgumentException("Name should be non null");
-		}
-		
-		if (activationKey == null) {
-			throw new IllegalArgumentException("Activation key should be non null");
-		}
+		checkArgument(login != null, "Login should be non null");
+		checkArgument(password != null, "Password should be non null");
+		checkArgument(name != null, "Name should be non null");
+		checkArgument(activationKey != null, "Activation key should be non null");
 
 		// use login as name if name is not provided
 		final String finalName;
@@ -134,22 +121,15 @@ public void registerUser(final String login, final String password,
 
 	@Transactional(readOnly = true)
 	public User findByLogin(final String login) {
-		if (login == null) {
-			throw new IllegalArgumentException("Login should be non null");
-		}
+		checkArgument(login != null, "Login should be non null");
 
 		return users.findByLogin(login);
 	}
 
 	@Transactional(readOnly = true)
 	public User findByLoginAndPassword(final String login, final String password) {
-		if (login == null) {
-			throw new IllegalArgumentException("Login should be non null");
-		}
-		
-		if (password == null) {
-			throw new IllegalArgumentException("Password should be non null");
-		}
+		checkArgument(login != null, "Login should be non null");
+		checkArgument(password != null, "Password should be non null");
 
 		final User user = users.findByLogin(login);
 		if (user == null) {

src/test/java/ru/mystamps/web/tests/page/AbstractPage.java

@@ -30,6 +30,8 @@
 import org.openqa.selenium.support.CacheLookup;
 import org.openqa.selenium.support.FindBy;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import ru.mystamps.web.tests.WebElementUtils;
 
 import static ru.mystamps.web.SiteMap.SITE_URL;
@@ -232,13 +234,8 @@ protected String getLinkHref(final WebElement link) {
 	}
 
 	public void login(final String login, final String password) {
-		if ("".equals(login)) {
-			throw new IllegalArgumentException("login must be not null and not empty");
-		}
-		
-		if ("".equals(password)) {
-			throw new IllegalArgumentException("password must be not null and not empty");
-		}
+		checkArgument(!"".equals(login), "login must be not null and not empty");
+		checkArgument(!"".equals(password), "password must be not null and not empty");
 
 		// TODO: check than we already authenticated and do nothing
 		final AuthAccountPage authPage = new AuthAccountPage(driver);

src/test/java/ru/mystamps/web/tests/page/element/Form.java

@@ -24,6 +24,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 public final class Form {
 	private static final String              FORM_LOCATOR = "//form";
 	private static final String       INPUT_FIELD_LOCATOR = "//input[@name=\"%s\"]";
@@ -194,10 +196,7 @@ public boolean hasInvalidValue() {
 		}
 
 		public Field invalidValue(final String invalidValue) {
-			if ("".equals(invalidValue)) {
-				throw new IllegalArgumentException("Invalid value for field should be non empty");
-			}
-			
+			checkArgument(!"".equals(invalidValue), "Invalid value for field should be non empty");
 			this.invalidValue = invalidValue;
 			return this;
 		}