Ported validation to using JSR-303 annotations.

Changes in dependencies:
- commons-validator and oro was removed (due to hibernate-validator usage)
- commons-beanutils was added

Fixed #86

Author: php-coder

pom.xml

@@ -127,9 +127,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-			<version>1.3.1</version>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.8.3</version>
 		</dependency>
 
 		<dependency>
@@ -233,13 +233,6 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<!-- commons-validator use it to validating e-mails -->
-		<dependency>
-			<groupId>oro</groupId>
-			<artifactId>oro</artifactId>
-			<version>2.0.8</version>
-		</dependency>
-		
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

src/main/config/checkstyle-suppressions.xml

@@ -18,4 +18,12 @@
 	<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenUserAtAnyPage" />
 	<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.cases.WhenUserAtAnyPageWithForm" />
 
+	<suppress checks="WhitespaceAround" files="ru.mystamps.web.validation.jsr303.Email" />
+	<suppress checks="WhitespaceAround" files="ru.mystamps.web.validation.jsr303.ExistingActivationKey" />
+	<suppress checks="WhitespaceAround" files="ru.mystamps.web.validation.jsr303.FieldsMatch" />
+	<suppress checks="WhitespaceAround" files="ru.mystamps.web.validation.jsr303.FieldsMismatch" />
+	<suppress checks="WhitespaceAround" files="ru.mystamps.web.validation.jsr303.UniqueCountryName" />
+	<suppress checks="WhitespaceAround" files="ru.mystamps.web.validation.jsr303.UniqueLogin" />
+	<suppress checks="WhitespaceAround" files="ru.mystamps.web.validation.jsr303.ValidCredentials" />
+	
 </suppressions>

src/main/config/checkstyle.xml

@@ -122,7 +122,7 @@
         <!-- See http://checkstyle.sf.net/config_import.html -->
         <module name="AvoidStarImport"/>
         <module name="IllegalImport"> <!-- defaults to sun.* packages -->
-            <property name="illegalPkgs" value="java.sql, org.hibernate, org.apache.log4j"/>
+            <property name="illegalPkgs" value="java.sql, org.apache.log4j"/>
         </module>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -42,8 +42,7 @@
 @ComponentScan(basePackages = {
 	"ru.mystamps.web.controller",
 	"ru.mystamps.web.dao",
-	"ru.mystamps.web.service",
-	"ru.mystamps.web.validation"
+	"ru.mystamps.web.service"
 })
 public class MvcConfig extends WebMvcConfigurerAdapter {
 

src/main/java/ru/mystamps/web/controller/ActivateAccountController.java

@@ -21,7 +21,6 @@
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.validation.Valid;
 
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.stereotype.Controller;
@@ -31,10 +30,16 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 
 import ru.mystamps.web.model.ActivateAccountForm;
+import ru.mystamps.web.model.ActivateAccountForm.LoginChecks;
+import ru.mystamps.web.model.ActivateAccountForm.NameChecks;
+import ru.mystamps.web.model.ActivateAccountForm.PasswordChecks;
+import ru.mystamps.web.model.ActivateAccountForm.PasswordConfirmationChecks;
+import ru.mystamps.web.model.ActivateAccountForm.ActKeyChecks;
+import ru.mystamps.web.model.ActivateAccountForm.FormChecks;
 import ru.mystamps.web.service.UserService;
-import ru.mystamps.web.validation.ActivateAccountValidator;
 
 import static ru.mystamps.web.SiteMap.ACTIVATE_ACCOUNT_PAGE_URL;
 import static ru.mystamps.web.SiteMap.ACTIVATE_ACCOUNT_PAGE_WITH_KEY_URL;
@@ -44,21 +49,15 @@
 public class ActivateAccountController {
 
 	private final UserService userService;
-	private final ActivateAccountValidator activateAccountValidator;
 
 	@Inject
-	ActivateAccountController(
-		final UserService userService,
-		final ActivateAccountValidator activateAccountValidator) {
-		
+	ActivateAccountController(final UserService userService) {
 		this.userService = userService;
-		this.activateAccountValidator = activateAccountValidator;
 	}
 
 	@InitBinder
 	protected void initBinder(final WebDataBinder binder) {
-		binder.setValidator(activateAccountValidator);
-		binder.registerCustomEditor(String.class, "name", new StringTrimmerEditor(false));
+		binder.registerCustomEditor(String.class, "name", new StringTrimmerEditor(true));
 	}
 
 	@RequestMapping(value = ACTIVATE_ACCOUNT_PAGE_URL, method = RequestMethod.GET)
@@ -78,8 +77,10 @@ public String showForm(@PathVariable("key") final String activationKey, final Ma
 
 	@RequestMapping(value = ACTIVATE_ACCOUNT_PAGE_URL, method = RequestMethod.POST)
 	public String processInput(
-			@Valid final ActivateAccountForm form,
-			final BindingResult result) {
+		@Validated({
+			LoginChecks.class, NameChecks.class, PasswordChecks.class,
+			PasswordConfirmationChecks.class, ActKeyChecks.class, FormChecks.class
+		}) final ActivateAccountForm form, final BindingResult result) {
 
 		if (result.hasErrors()) {
 			return null;

src/main/java/ru/mystamps/web/controller/AddCountryController.java

@@ -31,7 +31,6 @@
 
 import ru.mystamps.web.model.AddCountryForm;
 import ru.mystamps.web.service.CountryService;
-import ru.mystamps.web.validation.AddCountryValidator;
 
 import static ru.mystamps.web.SiteMap.ADD_COUNTRY_PAGE_URL;
 import static ru.mystamps.web.SiteMap.INFO_COUNTRY_PAGE_URL;
@@ -40,20 +39,15 @@
 @RequestMapping(ADD_COUNTRY_PAGE_URL)
 public class AddCountryController {
 
-	private final AddCountryValidator addCountryValidator;
 	private final CountryService countryService;
 
 	@Inject
-	AddCountryController(
-			final AddCountryValidator addCountryValidator,
-			final CountryService countryService) {
-		this.addCountryValidator = addCountryValidator;
+	AddCountryController(final CountryService countryService) {
 		this.countryService = countryService;
 	}
 
 	@InitBinder
 	protected void initBinder(final WebDataBinder binder) {
-		binder.setValidator(addCountryValidator);
 		binder.registerCustomEditor(String.class, "country", new StringTrimmerEditor(false));
 	}
 

src/main/java/ru/mystamps/web/controller/AuthAccountController.java

@@ -21,21 +21,21 @@
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.WebDataBinder;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.model.AuthAccountForm;
+import ru.mystamps.web.model.AuthAccountForm.FormChecks;
+import ru.mystamps.web.model.AuthAccountForm.LoginChecks;
+import ru.mystamps.web.model.AuthAccountForm.PasswordChecks;
 import ru.mystamps.web.service.SiteService;
 import ru.mystamps.web.service.UserService;
-import ru.mystamps.web.validation.AuthAccountValidator;
 
 import static ru.mystamps.web.SiteMap.INDEX_PAGE_URL;
 import static ru.mystamps.web.SiteMap.AUTHENTICATION_PAGE_URL;
@@ -46,22 +46,11 @@ public class AuthAccountController {
 
 	private final UserService userService;
 	private final SiteService siteService;
-	private final AuthAccountValidator authAccountValidator;
 
 	@Inject
-	AuthAccountController(
-		final UserService userService,
-		final SiteService siteService,
-		final AuthAccountValidator authAccountValidator) {
-		
+	AuthAccountController(final UserService userService, final SiteService siteService) {
 		this.userService = userService;
 		this.siteService = siteService;
-		this.authAccountValidator = authAccountValidator;
-	}
-	
-	@InitBinder
-	protected void initAuthBinder(final WebDataBinder binder) {
-		binder.setValidator(authAccountValidator);
 	}
 
 	@RequestMapping(method = RequestMethod.GET)
@@ -75,18 +64,21 @@ public String processInput(
 			final HttpSession session,
 			@RequestHeader(value = "referer", required = false) final String referer,
 			@RequestHeader(value = "user-agent", required = false) final String agent,
-			@Valid final AuthAccountForm form,
+			@Validated({
+				LoginChecks.class,
+				PasswordChecks.class,
+				FormChecks.class
+			}) final AuthAccountForm form,
 			final BindingResult result) {
 
 		if (result.hasErrors()) {
 
 			// When user provides wrong login/password pair than
 			// validation mechanism add error to form. Check this to
 			// handle situation with wrong credentials.
-			// @see AuthAccountValidator::validateLoginPasswordPair()
 			if (result.hasGlobalErrors()
 					&& result.getGlobalError() != null
-					&& result.getGlobalError().getCode().equals("login.password.invalid")) {
+					&& "ValidCredentials".equals(result.getGlobalError().getCode())) {
 
 				// TODO: log more info (login for example) (#59)
 				// TODO: sanitize all user's values (#60)

src/main/java/ru/mystamps/web/controller/RegisterAccountController.java

@@ -31,7 +31,6 @@
 
 import ru.mystamps.web.model.RegisterAccountForm;
 import ru.mystamps.web.service.UserService;
-import ru.mystamps.web.validation.RegisterAccountValidator;
 
 import static ru.mystamps.web.SiteMap.REGISTRATION_PAGE_URL;
 import static ru.mystamps.web.SiteMap.SUCCESSFUL_REGISTRATION_PAGE_URL;
@@ -41,20 +40,14 @@
 public class RegisterAccountController {
 
 	private final UserService userService;
-	private final RegisterAccountValidator registerAccountValidator;
 
 	@Inject
-	RegisterAccountController(
-		final UserService userService,
-		final RegisterAccountValidator registerAccountValidator) {
-		
+	RegisterAccountController(final UserService userService) {
 		this.userService = userService;
-		this.registerAccountValidator = registerAccountValidator;
 	}
 
 	@InitBinder
 	protected void initBinder(final WebDataBinder binder) {
-		binder.setValidator(registerAccountValidator);
 		binder.registerCustomEditor(String.class, "email", new StringTrimmerEditor(false));
 	}