From a2a899f1e2e9276762d63974207d2036fab45daf Mon Sep 17 00:00:00 2001 From: Ryan Laddusaw Date: Wed, 13 May 2020 12:31:43 -0500 Subject: [PATCH] Changed regex to static string --- .../tamu/app/model/validation/ProductValidator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/tamu/app/model/validation/ProductValidator.java b/src/main/java/edu/tamu/app/model/validation/ProductValidator.java index a844be8f..ff274b2d 100644 --- a/src/main/java/edu/tamu/app/model/validation/ProductValidator.java +++ b/src/main/java/edu/tamu/app/model/validation/ProductValidator.java @@ -6,20 +6,22 @@ public class ProductValidator extends BaseModelValidator { + private static final String URL_REGEX = "^(https?|ftp|file|wss?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]+[-a-zA-Z0-9+&@#/%=~_|?]"; + public ProductValidator() { String nameProperty = "name"; this.addInputValidator(new InputValidator(InputValidationType.required, "A Product requires a name", nameProperty, true)); String devUrlProperty = "devUrl"; - this.addInputValidator(new InputValidator(InputValidationType.pattern, "The development URL must be a valid URL", devUrlProperty, "^(https?|ftp|file|wss?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]+[-a-zA-Z0-9+&@#/%=~_|?]")); + this.addInputValidator(new InputValidator(InputValidationType.pattern, "The development URL must be a valid URL", devUrlProperty, URL_REGEX)); String preUrlProperty = "preUrl"; - this.addInputValidator(new InputValidator(InputValidationType.pattern, "The pre-production URL must be a valid URL", preUrlProperty, "^(https?|ftp|file|wss?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]+[-a-zA-Z0-9+&@#/%=~_|?]")); + this.addInputValidator(new InputValidator(InputValidationType.pattern, "The pre-production URL must be a valid URL", preUrlProperty, URL_REGEX)); String productionUrlProperty = "productionUrl"; - this.addInputValidator(new InputValidator(InputValidationType.pattern, "The production URL must be a valid URL", productionUrlProperty, "^(https?|ftp|file|wss?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]+[-a-zA-Z0-9+&@#/%=~_|?]")); + this.addInputValidator(new InputValidator(InputValidationType.pattern, "The production URL must be a valid URL", productionUrlProperty, URL_REGEX)); String wikiUrlProperty = "wikiUrl"; - this.addInputValidator(new InputValidator(InputValidationType.pattern, "The wiki URL must be a valid URL", wikiUrlProperty, "^(https?|ftp|file|wss?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]+[-a-zA-Z0-9+&@#/%=~_|?]")); + this.addInputValidator(new InputValidator(InputValidationType.pattern, "The wiki URL must be a valid URL", wikiUrlProperty, URL_REGEX)); } }