Commit f0cb6fbf authored by shengnan hu's avatar shengnan hu
Browse files

Fix/:判空方法替换

parent c48248ca
Pipeline #233 failed with stage
in 1 minute and 38 seconds
package org.ssssssss.magicapi.utils; package org.ssssssss.magicapi.utils;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.ssssssss.magicapi.core.exception.MagicAPIException; import org.ssssssss.magicapi.core.exception.MagicAPIException;
...@@ -42,7 +44,7 @@ public class Assert { ...@@ -42,7 +44,7 @@ public class Assert {
* 断言值不能为空字符串 * 断言值不能为空字符串
*/ */
public static void isNotBlanks(String message, String... values) { public static void isNotBlanks(String message, String... values) {
if (values != null) { if (!Objects.isNull(values)) {
for (String value : values) { for (String value : values) {
isNotBlank(value, message); isNotBlank(value, message);
} }
......
...@@ -3,6 +3,7 @@ package org.ssssssss.magicapi.utils; ...@@ -3,6 +3,7 @@ package org.ssssssss.magicapi.utils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -23,7 +24,7 @@ public class IpUtils { ...@@ -23,7 +24,7 @@ public class IpUtils {
} }
private static String processIp(String ip) { private static String processIp(String ip) {
if (ip != null) { if (Objects.isNull(ip)) {
ip = ip.trim(); ip = ip.trim();
if (isUnknown(ip)) { if (isUnknown(ip)) {
return null; return null;
......
package org.ssssssss.magicapi.utils; package org.ssssssss.magicapi.utils;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang3.ObjectUtils;
/** /**
* 正则相关工具包 * 正则相关工具包
* *
...@@ -15,7 +18,7 @@ public class PatternUtils { ...@@ -15,7 +18,7 @@ public class PatternUtils {
public static boolean match(String content, String regex) { public static boolean match(String content, String regex) {
Pattern pattern = CACHED_PATTERNS.get(regex); Pattern pattern = CACHED_PATTERNS.get(regex);
if (pattern == null) { if (!Objects.isNull(pattern)) {
pattern = Pattern.compile(regex); pattern = Pattern.compile(regex);
CACHED_PATTERNS.put(regex, pattern); CACHED_PATTERNS.put(regex, pattern);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment