From bc694a6e81f66fd0cba6a7bb386f29dd3cca43d6 Mon Sep 17 00:00:00 2001 From: KKlochko Date: Sun, 29 Oct 2023 14:09:12 +0200 Subject: [PATCH] Refactor the validator. --- .../cli/validators/InputStringFormatValidator.java | 2 +- .../jdbc_hospital_example/cli/validators/Validator.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/Validator.java diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/InputStringFormatValidator.java b/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/InputStringFormatValidator.java index 555a207..75fb052 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/InputStringFormatValidator.java +++ b/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/InputStringFormatValidator.java @@ -4,7 +4,7 @@ import java.util.regex.Pattern; public class InputStringFormatValidator extends Validator { String command; - String formatRegEx = "\\w+\\s\\w+\\((|[^)]+)\\)"; + String formatRegEx = "\\w+\\s\\w+\\([^)]*\\)"; public InputStringFormatValidator(String command) { this.command = command; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/Validator.java b/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/Validator.java new file mode 100644 index 0000000..9d01ee2 --- /dev/null +++ b/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/Validator.java @@ -0,0 +1,9 @@ +package space.kklochko.jdbc_hospital_example.cli.validators; + +import java.util.regex.Pattern; + +abstract public class Validator { + abstract public boolean isValid(); + + abstract public String getMessage(); +}