Use own validator ObjectUtils.anyNull to check null String input (#718)
This commit is contained in:
parent
ea34486551
commit
615c1dad1b
|
@ -256,7 +256,7 @@ public static String removePattern(final String text, final String regex) {
|
||||||
* @see java.util.regex.Pattern
|
* @see java.util.regex.Pattern
|
||||||
*/
|
*/
|
||||||
public static String replaceAll(final String text, final Pattern regex, final String replacement) {
|
public static String replaceAll(final String text, final Pattern regex, final String replacement) {
|
||||||
if (text == null || regex == null || replacement == null) {
|
if (ObjectUtils.anyNull(text, regex, replacement)) {
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
return regex.matcher(text).replaceAll(replacement);
|
return regex.matcher(text).replaceAll(replacement);
|
||||||
|
@ -310,7 +310,7 @@ public static String replaceAll(final String text, final Pattern regex, final St
|
||||||
* @see java.util.regex.Pattern#DOTALL
|
* @see java.util.regex.Pattern#DOTALL
|
||||||
*/
|
*/
|
||||||
public static String replaceAll(final String text, final String regex, final String replacement) {
|
public static String replaceAll(final String text, final String regex, final String replacement) {
|
||||||
if (text == null || regex == null || replacement == null) {
|
if (ObjectUtils.anyNull(text, regex, replacement)) {
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
return text.replaceAll(regex, replacement);
|
return text.replaceAll(regex, replacement);
|
||||||
|
@ -449,7 +449,7 @@ public static String replaceFirst(final String text, final String regex, final S
|
||||||
* @see Pattern#DOTALL
|
* @see Pattern#DOTALL
|
||||||
*/
|
*/
|
||||||
public static String replacePattern(final String text, final String regex, final String replacement) {
|
public static String replacePattern(final String text, final String regex, final String replacement) {
|
||||||
if (text == null || regex == null || replacement == null) {
|
if (ObjectUtils.anyNull(text, regex, replacement)) {
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
return Pattern.compile(regex, Pattern.DOTALL).matcher(text).replaceAll(replacement);
|
return Pattern.compile(regex, Pattern.DOTALL).matcher(text).replaceAll(replacement);
|
||||||
|
|
Loading…
Reference in New Issue