ActivateAccountForm: renamed field (passwordConfirm -> passwordConfirmation).

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/model/ActivateAccountForm.java

@@ -25,6 +25,6 @@ public class ActivateAccountForm {
 	@Getter @Setter private String login;
 	@Getter @Setter private String name;
 	@Getter @Setter private String password;
-	@Getter @Setter private String passwordConfirm;
+	@Getter @Setter private String passwordConfirmation;
 	@Getter @Setter private String activationKey;
 }

src/main/java/ru/mystamps/web/validation/ActivateAccountValidator.java

@@ -61,7 +61,7 @@ public void validate(final Object target, final Errors errors) {
 		validateLogin(form, errors);
 		validateName(form, errors);
 		validatePassword(form, errors);
-		validatePasswordConfirm(form, errors);
+		validatePasswordConfirmation(form, errors);
 		validateActivationKey(form, errors);
 	}
 
@@ -167,21 +167,21 @@ private static void validatePassword(final ActivateAccountForm form, final Error
 		}
 	}
 
-	private static void validatePasswordConfirm(
+	private static void validatePasswordConfirmation(
 			final ActivateAccountForm form,
 			final Errors errors) {
 
-		ValidationUtils.rejectIfEmptyOrWhitespace(errors, "passwordConfirm", "value.required");
-		if (errors.hasFieldErrors("passwordConfirm")) {
+		ValidationUtils.rejectIfEmptyOrWhitespace(errors, "passwordConfirmation", "value.required");
+		if (errors.hasFieldErrors("passwordConfirmation")) {
 			return;
 		}
 
 		final String password = form.getPassword();
-		final String passwordConfirm = form.getPasswordConfirm();
+		final String passwordConfirmation = form.getPasswordConfirmation();
 
 		if (!errors.hasFieldErrors("password")
-				&& !passwordConfirm.equals(password)) {
-			errors.rejectValue("passwordConfirm", "password.mismatch");
+				&& !passwordConfirmation.equals(password)) {
+			errors.rejectValue("passwordConfirmation", "password.mismatch");
 			return;
 		}
 	}

src/main/webapp/WEB-INF/pages/account/activate.jsp

@@ -71,18 +71,18 @@
 						</tr>
 						<tr>
 							<td>
-								<form:label path="passwordConfirm">
+								<form:label path="passwordConfirmation">
 									<spring:message code="t_password_again" />
 								</form:label>
 							</td>
 							<td>
-								<span id="passwordConfirm.required" class="required_field">*</span>
+								<span id="passwordConfirmation.required" class="required_field">*</span>
 							</td>
 							<td>
-								<form:password path="passwordConfirm" />
+								<form:password path="passwordConfirmation" />
 							</td>
 							<td>
-								<form:errors path="passwordConfirm" cssClass="error" />
+								<form:errors path="passwordConfirmation" cssClass="error" />
 							</td>
 						</tr>
 						<tr>

src/test/java/ru/mystamps/web/tests/cases/WhenUserActivateAccount.java

@@ -90,7 +90,7 @@ public void passwordAndConfirmationShouldMatch() {
 		page.activateAccount(null, null, "password123", "password321", null);
 
 		assertThat(page)
-			.field("passwordConfirm")
+			.field("passwordConfirmation")
 			.hasError(tr("password.mismatch"));
 	}
 

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

@@ -53,7 +53,7 @@ public ActivateAccountPage(final WebDriver driver) {
 					.and()
 					.invalidValue("x"),
 
-				required(passwordField("passwordConfirm"))
+				required(passwordField("passwordConfirmation"))
 					.withLabel(tr("t_password_again"))
 					.and()
 					.invalidValue("x"),
@@ -115,7 +115,7 @@ private void fillPassword(final String password) {
 
 	private void fillPasswordConfirmation(final String passwordConfirmation) {
 		if (passwordConfirmation != null) {
-			fillField("passwordConfirm", passwordConfirmation);
+			fillField("passwordConfirmation", passwordConfirmation);
 		}
 	}