From a44c7bc13d14d97c283aaddd914b748235f01bd6 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 13 May 2016 07:40:25 +0200 Subject: [PATCH] WW-4626 Adds support for .cat domain --- .../xwork2/validator/validators/EmailValidator.java | 4 ++-- .../com/opensymphony/xwork2/validator/EmailValidatorTest.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java index 9b196d56e..9410eb659 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java @@ -23,7 +23,7 @@ package com.opensymphony.xwork2.validator.validators; * The regular expression used to validate that the string is an email address is: * * 
- * \\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tech|tel|travel|xxx)$\\b
+ * \\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx|tech|cat)$\\b
  *
* * You can also specify expression, caseSensitive and trim params as a OGNL expression, see the example below. @@ -80,7 +80,7 @@ public class EmailValidator extends RegexFieldValidator { // see XW-371 public static final String EMAIL_ADDRESS_PATTERN = - "\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tech|tel|travel|xxx)$\\b"; + "\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx|tech|cat)$\\b"; public EmailValidator() { setRegex(EMAIL_ADDRESS_PATTERN); diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java index 8d3268500..2de1f1823 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java @@ -46,6 +46,7 @@ public class EmailValidatorTest extends XWorkTestCase { assertTrue(verifyEmailValidity("ferda+mravenec@yahoo.com")); assertTrue(verifyEmailValidity("Ferda+Mravenec@yaHoo.CoM")); assertTrue(verifyEmailValidity("user@domainname.tech")); + assertTrue(verifyEmailValidity("Ferda+Mravenec@yaHoo.cat")); assertFalse(verifyEmailValidity("tm_jee#marry@yahoo.co.uk")); assertFalse(verifyEmailValidity("tm_jee@ yahoo.co.uk"));