From 7357e9c3a296e04571bef2a8b08b2eb599634e22 Mon Sep 17 00:00:00 2001 From: Oleksandra Dorofieieva Date: Thu, 12 Oct 2023 18:50:29 +0300 Subject: [PATCH] hw-checked-exception --- .../core/basesyntax/PasswordValidationException.java | 6 +++++- src/main/java/core/basesyntax/PasswordValidator.java | 10 ++++++++-- src/main/java/core/basesyntax/UserService.java | 9 ++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/core/basesyntax/PasswordValidationException.java b/src/main/java/core/basesyntax/PasswordValidationException.java index c9e7ed3e7..70c1d49fd 100644 --- a/src/main/java/core/basesyntax/PasswordValidationException.java +++ b/src/main/java/core/basesyntax/PasswordValidationException.java @@ -1,3 +1,7 @@ package core.basesyntax; -//write your code here +public class PasswordValidationException extends Exception { + public PasswordValidationException(String message) { + super(message); + } +} diff --git a/src/main/java/core/basesyntax/PasswordValidator.java b/src/main/java/core/basesyntax/PasswordValidator.java index d4655c9f5..6c1dc2641 100644 --- a/src/main/java/core/basesyntax/PasswordValidator.java +++ b/src/main/java/core/basesyntax/PasswordValidator.java @@ -1,7 +1,13 @@ package core.basesyntax; public class PasswordValidator { - public void validate(String password, String repeatPassword) { - //write your code here + public void validate(String password, String repeatPassword) + throws PasswordValidationException { + if (password == null || repeatPassword == null + || password.isEmpty() || repeatPassword.isEmpty() + || !(password.length() >= 10 && repeatPassword.length() >= 10) + || !password.equals(repeatPassword)) { + throw new PasswordValidationException("Wrong passwords"); + } } } diff --git a/src/main/java/core/basesyntax/UserService.java b/src/main/java/core/basesyntax/UserService.java index 52f08d130..7aee75a82 100644 --- a/src/main/java/core/basesyntax/UserService.java +++ b/src/main/java/core/basesyntax/UserService.java @@ -2,7 +2,14 @@ public class UserService { public void registerUser(User user) { - //write your code here + PasswordValidator passwordValidator = new PasswordValidator(); + + try { + passwordValidator.validate(user.getPassword(), user.getRepeatPassword()); + saveUser(user); + } catch (PasswordValidationException exception) { + System.out.println("Your passwords are incorrect. Try again."); + } } public void saveUser(User user) {