From 45580718ab01627d4cf2b168e65e4d0016681a54 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 27 Jan 2017 08:27:50 +0100 Subject: [PATCH] WW-4735 Uses more flexible RegExp to match domain suffixes --- .../xwork2/validator/validators/EmailValidator.java | 6 ++---- .../opensymphony/xwork2/validator/EmailValidatorTest.java | 1 + 2 files changed, 3 insertions(+), 4 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 9410eb659..98958a0a8 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|tel|travel|xxx|tech|cat)$\\b
+ * \\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,6})$\\b
  *
* * You can also specify expression, caseSensitive and trim params as a OGNL expression, see the example below. @@ -78,9 +78,7 @@ package com.opensymphony.xwork2.validator.validators; */ 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|tel|travel|xxx|tech|cat)$\\b"; + public static final String EMAIL_ADDRESS_PATTERN = "\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2,6})$\\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 2de1f1823..721ce08fc 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java @@ -47,6 +47,7 @@ public class EmailValidatorTest extends XWorkTestCase { assertTrue(verifyEmailValidity("Ferda+Mravenec@yaHoo.CoM")); assertTrue(verifyEmailValidity("user@domainname.tech")); assertTrue(verifyEmailValidity("Ferda+Mravenec@yaHoo.cat")); + assertTrue(verifyEmailValidity("user@domainname.swiss")); assertFalse(verifyEmailValidity("tm_jee#marry@yahoo.co.uk")); assertFalse(verifyEmailValidity("tm_jee@ yahoo.co.uk"));