Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

improve ValidationUtil

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-08-06 13:40:22 +02:00
parent 215eb289ad
commit 40bc8d88b2
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
View File

@@ -66,9 +66,7 @@ public class ValidationUtil
*/ */
public static boolean isFilenameValid(String value) public static boolean isFilenameValid(String value)
{ {
AssertUtil.assertIsNotNull(value); return Util.isNotEmpty(value) && isNotContaining(value, "/", "\\", ":");
return isNotContaining(value, "/", "\\", ":");
} }
/** /**
@@ -81,9 +79,7 @@ public class ValidationUtil
*/ */
public static boolean isMailAddressValid(String value) public static boolean isMailAddressValid(String value)
{ {
AssertUtil.assertIsNotNull(value); return Util.isNotEmpty(value) && value.matches(REGEX_MAIL);
return value.matches(REGEX_MAIL);
} }
/** /**
@@ -96,9 +92,7 @@ public class ValidationUtil
*/ */
public static boolean isNameValid(String name) public static boolean isNameValid(String name)
{ {
AssertUtil.assertIsNotNull(name); return Util.isNotEmpty(name) && name.matches(REGEX_NAME);
return name.matches(REGEX_NAME);
} }
/** /**
@@ -113,11 +107,9 @@ public class ValidationUtil
public static boolean isNotContaining(String value, public static boolean isNotContaining(String value,
String... notAllowedStrings) String... notAllowedStrings)
{ {
AssertUtil.assertIsNotNull(value); boolean result = Util.isNotEmpty(value);
boolean result = true; if (result && (notAllowedStrings != null))
if (notAllowedStrings != null)
{ {
for (String nas : notAllowedStrings) for (String nas : notAllowedStrings)
{ {
@@ -143,9 +135,7 @@ public class ValidationUtil
*/ */
public static boolean isUsernameValid(String username) public static boolean isUsernameValid(String username)
{ {
AssertUtil.assertIsNotNull(username); return Util.isNotEmpty(username) && username.matches(REGEX_USERNAME);
return username.matches(REGEX_USERNAME);
} }
/** /**