This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 611739637 [imporve] null judge modify. (#2558)
611739637 is described below
commit 61173963770cec058507994dfe2a074e9ba693ea
Author: b_mountain <[email protected]>
AuthorDate: Tue Aug 27 23:54:50 2024 +0800
[imporve] null judge modify. (#2558)
Co-authored-by: 刘进山 <[email protected]>
Co-authored-by: YuLuo <[email protected]>
Co-authored-by: Calvin <[email protected]>
Co-authored-by: tomsun28 <[email protected]>
---
.../manager/component/status/CalculateStatus.java | 4 +-
.../manager/config/CommonCommandLineRunner.java | 4 +-
.../manager/scheduler/CollectorJobScheduler.java | 69 +++++++++++-----------
.../hertzbeat/manager/scheduler/SchedulerInit.java | 4 +-
.../netty/process/CollectorOnlineProcessor.java | 4 +-
.../manager/service/impl/AccountServiceImpl.java | 7 ++-
.../manager/service/impl/AppServiceImpl.java | 22 ++++---
.../manager/service/impl/CollectorServiceImpl.java | 12 ++--
.../manager/service/impl/ConfigServiceImpl.java | 3 +-
.../service/impl/ExcelImExportServiceImpl.java | 10 ++--
.../manager/service/impl/MonitorServiceImpl.java | 40 ++++++-------
.../service/impl/NoticeConfigServiceImpl.java | 9 +--
.../manager/service/impl/TagServiceImpl.java | 2 +-
.../DingTalkRobotAlertNotifyHandlerImplTest.java | 4 +-
.../impl/DiscordBotAlertNotifyHandlerImplTest.java | 4 +-
.../impl/FlyBookAlertNotifyHandlerImplTest.java | 4 +-
.../HuaweiCloudSmnAlertNotifyHandlerImplTest.java | 12 ++--
.../impl/SlackAlertNotifyHandlerImplTest.java | 4 +-
.../TelegramBotAlertNotifyHandlerImplTest.java | 4 +-
.../impl/WeChatAppAlertNotifyHandlerImplTest.java | 4 +-
.../impl/WeComRobotAlertNotifyHandlerImplTest.java | 4 +-
21 files changed, 117 insertions(+), 113 deletions(-)
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java
b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java
index 828aa495c..ec37ea966 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java
@@ -37,6 +37,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.manager.Monitor;
import org.apache.hertzbeat.common.entity.manager.StatusPageComponent;
@@ -51,7 +52,6 @@ import org.apache.hertzbeat.manager.dao.StatusPageHistoryDao;
import org.apache.hertzbeat.manager.dao.StatusPageOrgDao;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
/**
* calculate component status for status page
@@ -115,7 +115,7 @@ public class CalculateStatus {
ListJoin<Monitor, Tag> tagJoin = root
.join(root.getModel()
.getList("tags",
Tag.class), JoinType.LEFT);
- if
(StringUtils.hasText(tagItem.getValue())) {
+ if
(StringUtils.isNotBlank(tagItem.getValue())) {
andList.add(criteriaBuilder.equal(tagJoin.get("name"), tagItem.getName()));
andList.add(criteriaBuilder.equal(tagJoin.get("tagValue"), tagItem.getValue()));
} else {
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java
b/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java
index 71fc96023..f1cac1a2b 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Locale;
import java.util.Random;
import java.util.TimeZone;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.manager.GeneralConfig;
import org.apache.hertzbeat.common.util.TimeZoneUtil;
@@ -40,7 +41,6 @@ import org.springframework.boot.CommandLineRunner;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
/**
* Common CommandLineRunner class
@@ -106,7 +106,7 @@ public class CommonCommandLineRunner implements
CommandLineRunner {
if (DEFAULT_JWT_SECRET.equals(currentJwtSecret)) {
// use the random jwt secret
SystemSecret systemSecret = systemSecretService.getConfig();
- if (systemSecret == null ||
!StringUtils.hasText(systemSecret.getJwtSecret())) {
+ if (systemSecret == null ||
StringUtils.isBlank(systemSecret.getJwtSecret())) {
char[] chars = DEFAULT_JWT_SECRET.toCharArray();
Random rand = new Random();
for (int i = 0; i < chars.length; i++) {
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
index a2e49645d..a935061d0 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java
@@ -22,13 +22,15 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import
org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService;
import
org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener;
import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -53,7 +55,6 @@ import org.apache.hertzbeat.manager.service.AppService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
/**
* collector service
@@ -92,14 +93,12 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
@Override
public void collectorGoOnline(String identity, CollectorInfo
collectorInfo) {
- if (identity == null) {
+ if (StringUtils.isBlank(identity)) {
log.error("identity can not be null if collector not existed");
return;
}
- Optional<Collector> collectorOptional =
collectorDao.findCollectorByName(identity);
- Collector collector;
- if (collectorOptional.isPresent()) {
- collector = collectorOptional.get();
+ Collector collector =
collectorDao.findCollectorByName(identity).orElse(null);
+ if (Objects.nonNull(collector)) {
if (collector.getStatus() ==
CommonConstants.COLLECTOR_STATUS_ONLINE) {
return;
}
@@ -129,13 +128,12 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
reBalanceCollectorAssignJobs();
// Read database The fixed collection tasks at this collector are
delivered
List<CollectorMonitorBind> binds =
collectorMonitorBindDao.findCollectorMonitorBindsByCollector(identity);
- for (CollectorMonitorBind bind : binds) {
- Optional<Monitor> monitorOptional =
monitorDao.findById(bind.getMonitorId());
- if (monitorOptional.isEmpty()) {
- continue;
- }
- Monitor monitor = monitorOptional.get();
- if (monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE) {
+ if (CollectionUtils.isEmpty(binds)){
+ return;
+ }
+ List<Monitor> monitors =
monitorDao.findMonitorsByIdIn(binds.stream().map(CollectorMonitorBind::getMonitorId).collect(Collectors.toSet()));
+ for (Monitor monitor : monitors) {
+ if (Objects.isNull(monitor) || monitor.getStatus() ==
CommonConstants.MONITOR_PAUSED_CODE) {
continue;
}
try {
@@ -150,15 +148,20 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
appDefine.setTimestamp(System.currentTimeMillis());
List<Param> params =
paramDao.findParamsByMonitorId(monitor.getId());
List<Configmap> configmaps = params.stream()
- .map(param -> new Configmap(param.getField(),
param.getParamValue(),
- param.getType())).collect(Collectors.toList());
+ .map(param -> Configmap.builder()
+ .key(param.getField())
+ .value(param.getParamValue())
+
.type(param.getType()).build()).collect(Collectors.toList());
List<ParamDefine> paramDefaultValue =
appDefine.getParams().stream()
- .filter(item ->
StringUtils.hasText(item.getDefaultValue()))
+ .filter(item ->
StringUtils.isNotBlank(item.getDefaultValue()))
.toList();
paramDefaultValue.forEach(defaultVar -> {
if (configmaps.stream().noneMatch(item ->
item.getKey().equals(defaultVar.getField()))) {
- Configmap configmap = new
Configmap(defaultVar.getField(), defaultVar.getDefaultValue(), (byte) 1);
- configmaps.add(configmap);
+ configmaps.add(Configmap.builder()
+ .key(defaultVar.getField())
+ .value(defaultVar.getDefaultValue())
+ .type((byte) 1)
+ .build());
}
});
appDefine.setConfigmap(configmaps);
@@ -173,12 +176,11 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
@Override
public void collectorGoOffline(String identity) {
- Optional<Collector> collectorOptional =
collectorDao.findCollectorByName(identity);
- if (collectorOptional.isEmpty()) {
+ Collector collector =
collectorDao.findCollectorByName(identity).orElse(null);
+ if (Objects.isNull(collector)) {
log.info("the collector : {} not found.", identity);
return;
}
- Collector collector = collectorOptional.get();
collector.setStatus(CommonConstants.COLLECTOR_STATUS_OFFLINE);
collectorDao.save(collector);
consistentHash.removeNode(identity);
@@ -191,14 +193,14 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
consistentHash.getAllNodes().entrySet().parallelStream().forEach(entry
-> {
String collectorName = entry.getKey();
AssignJobs assignJobs = entry.getValue().getAssignJobs();
- if (collectorName == null || assignJobs == null) {
+ if (StringUtils.isBlank(collectorName) ||
Objects.isNull(assignJobs)) {
return;
}
- if (assignJobs.getAddingJobs() != null &&
!assignJobs.getAddingJobs().isEmpty()) {
+ if (CollectionUtils.isNotEmpty(assignJobs.getAddingJobs())) {
Set<Long> addedJobIds = new HashSet<>(8);
for (Long addingJobId : assignJobs.getAddingJobs()) {
Job job = jobContentCache.get(addingJobId);
- if (job == null) {
+ if (Objects.isNull(job)) {
log.error("assigning job {} content is null.",
addingJobId);
continue;
}
@@ -217,7 +219,7 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
assignJobs.addAssignJobs(addedJobIds);
assignJobs.removeAddingJobs(addedJobIds);
}
- if (assignJobs.getRemovingJobs() != null &&
!assignJobs.getRemovingJobs().isEmpty()) {
+ if (CollectionUtils.isNotEmpty(assignJobs.getRemovingJobs())) {
if (CommonConstants.MAIN_COLLECTOR_NODE.equals(collectorName))
{
assignJobs.getRemovingJobs().forEach(jobId ->
collectJobService.cancelAsyncCollectJob(jobId));
} else {
@@ -251,11 +253,10 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
@Override
public boolean onlineCollector(String identity) {
- Optional<Collector> collectorOptional =
collectorDao.findCollectorByName(identity);
- if (collectorOptional.isEmpty()) {
+ Collector collector =
collectorDao.findCollectorByName(identity).orElse(null);
+ if (Objects.isNull(collector)) {
return false;
}
- Collector collector = collectorOptional.get();
ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
.setType(ClusterMsg.MessageType.GO_ONLINE)
.setDirection(ClusterMsg.Direction.REQUEST)
@@ -281,7 +282,7 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
// todo dispatchKey ip+port or id
String dispatchKey = String.valueOf(job.getMonitorId());
ConsistentHash.Node node = consistentHash.preDispatchJob(dispatchKey);
- if (node == null) {
+ if (Objects.isNull(node)) {
log.error("there is no collector online to assign job.");
CollectRep.MetricsData metricsData =
CollectRep.MetricsData.newBuilder()
.setCode(CollectRep.Code.FAIL)
@@ -326,7 +327,7 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
@Override
public List<CollectRep.MetricsData> collectSyncJobData(Job job, String
collector) {
ConsistentHash.Node node = consistentHash.getNode(collector);
- if (node == null) {
+ if (Objects.isNull(node)) {
log.error("there is no collector online to assign job.");
CollectRep.MetricsData metricsData =
CollectRep.MetricsData.newBuilder()
.setCode(CollectRep.Code.FAIL)
@@ -371,7 +372,7 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
job.setId(jobId);
jobContentCache.put(jobId, job);
ConsistentHash.Node node;
- if (collector == null) {
+ if (StringUtils.isBlank(collector)) {
// todo dispatchKey ip+port or id
String dispatchKey = String.valueOf(job.getMonitorId());
node = consistentHash.dispatchJob(dispatchKey, jobId);
@@ -447,13 +448,13 @@ public class CollectorJobScheduler implements
CollectorScheduling, CollectJobSch
@Override
public void collectSyncJobResponse(List<CollectRep.MetricsData>
metricsDataList) {
- if (metricsDataList.isEmpty()) {
+ if (CollectionUtils.isEmpty(metricsDataList)) {
return;
}
CollectRep.MetricsData metricsData = metricsDataList.get(0);
long monitorId = metricsData.getId();
CollectResponseEventListener eventListener =
eventListeners.remove(monitorId);
- if (eventListener != null) {
+ if (Objects.nonNull(eventListener)) {
eventListener.response(metricsDataList);
}
}
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
index 3a79aa1f6..34d2d9d02 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
import org.apache.hertzbeat.common.entity.job.Configmap;
@@ -40,7 +41,6 @@ import org.springframework.boot.CommandLineRunner;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
-import org.springframework.util.StringUtils;
/**
* scheduler init
@@ -110,7 +110,7 @@ public class SchedulerInit implements CommandLineRunner {
.map(param -> new Configmap(param.getField(),
param.getParamValue(),
param.getType())).collect(Collectors.toList());
List<ParamDefine> paramDefaultValue =
appDefine.getParams().stream()
- .filter(item ->
StringUtils.hasText(item.getDefaultValue()))
+ .filter(item ->
StringUtils.isNotBlank(item.getDefaultValue()))
.toList();
paramDefaultValue.forEach(defaultVar -> {
if (configmaps.stream().noneMatch(item ->
item.getKey().equals(defaultVar.getField()))) {
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java
b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java
index ab48b2203..f48412232 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java
@@ -20,12 +20,12 @@ package
org.apache.hertzbeat.manager.scheduler.netty.process;
import io.netty.channel.ChannelHandlerContext;
import java.net.InetSocketAddress;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
import org.apache.hertzbeat.common.entity.message.ClusterMsg;
import org.apache.hertzbeat.common.util.JsonUtil;
import org.apache.hertzbeat.manager.scheduler.netty.ManageServer;
import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor;
-import org.springframework.util.StringUtils;
/**
* handle collector online message
@@ -43,7 +43,7 @@ public class CollectorOnlineProcessor implements
NettyRemotingProcessor {
String collector = message.getIdentity();
log.info("the collector {} actively requests to go online.",
collector);
CollectorInfo collectorInfo = JsonUtil.fromJson(message.getMsg(),
CollectorInfo.class);
- if (collectorInfo != null &&
!StringUtils.hasText(collectorInfo.getIp())) {
+ if (collectorInfo != null &&
StringUtils.isBlank(collectorInfo.getIp())) {
// fetch remote ip address
InetSocketAddress socketAddress = (InetSocketAddress)
ctx.channel().remoteAddress();
String clientIP = socketAddress.getAddress().getHostAddress();
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AccountServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AccountServiceImpl.java
index e59a18f95..7d14d6234 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AccountServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AccountServiceImpl.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import javax.naming.AuthenticationException;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.util.JsonUtil;
import org.apache.hertzbeat.manager.pojo.dto.LoginDto;
import org.apache.hertzbeat.manager.pojo.dto.RefreshTokenResponse;
@@ -55,11 +56,11 @@ public class AccountServiceImpl implements AccountService {
@Override
public Map<String, String> authGetToken(LoginDto loginDto) throws
AuthenticationException {
SurenessAccount account =
accountProvider.loadAccount(loginDto.getIdentifier());
- if (account == null || account.getPassword() == null) {
+ if (account == null || StringUtils.isBlank(account.getPassword())) {
throw new AuthenticationException("Incorrect Account or Password");
} else {
String password = loginDto.getCredential();
- if (account.getSalt() != null) {
+ if (StringUtils.isNotBlank(account.getSalt())) {
password = Md5Util.md5(password + account.getSalt());
}
if (!account.getPassword().equals(password)) {
@@ -89,7 +90,7 @@ public class AccountServiceImpl implements AccountService {
Claims claims = JsonWebTokenUtil.parseJwt(refreshToken);
String userId = String.valueOf(claims.getSubject());
boolean isRefresh = claims.get("refresh", Boolean.class);
- if (userId == null || !isRefresh) {
+ if (StringUtils.isBlank(userId) || !isRefresh) {
throw new AuthenticationException("Illegal Refresh Token");
}
SurenessAccount account = accountProvider.loadAccount(userId);
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java
index a3a2b9113..d2537515b 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java
@@ -38,6 +38,7 @@ import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
import org.apache.hertzbeat.collector.util.CollectUtil;
import org.apache.hertzbeat.common.entity.job.Configmap;
@@ -70,7 +71,6 @@ import
org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.StreamUtils;
-import org.springframework.util.StringUtils;
import org.yaml.snakeyaml.Yaml;
/**
@@ -106,15 +106,13 @@ public class AppServiceImpl implements AppService,
CommandLineRunner {
@Override
public List<ParamDefine> getAppParamDefines(String app) {
- if (!StringUtils.hasText(app)) {
- return Collections.emptyList();
- }
- var appDefine = appDefines.get(app.toLowerCase());
- if (appDefine != null && appDefine.getParams() != null) {
- return appDefine.getParams();
- } else {
- return Collections.emptyList();
+ if (StringUtils.isNotBlank(app)){
+ var appDefine = appDefines.get(app.toLowerCase());
+ if (appDefine != null && appDefine.getParams() != null) {
+ return appDefine.getParams();
+ }
}
+ return Collections.emptyList();
}
@Override
@@ -170,7 +168,7 @@ public class AppServiceImpl implements AppService,
CommandLineRunner {
@Override
public Job getAppDefine(String app) throws IllegalArgumentException {
- if (!StringUtils.hasText(app)) {
+ if (StringUtils.isBlank(app)) {
throw new IllegalArgumentException("The app can not null.");
}
var appDefine = appDefines.get(app.toLowerCase());
@@ -182,7 +180,7 @@ public class AppServiceImpl implements AppService,
CommandLineRunner {
@Override
public Optional<Job> getAppDefineOption(String app) {
- if (StringUtils.hasText(app)) {
+ if (StringUtils.isNotBlank(app)) {
Job appDefine = appDefines.get(app.toLowerCase());
return Optional.ofNullable(appDefine);
}
@@ -192,7 +190,7 @@ public class AppServiceImpl implements AppService,
CommandLineRunner {
@Override
public List<String> getAppDefineMetricNames(String app) {
List<String> metricNames = new ArrayList<>(16);
- if (StringUtils.hasLength(app)) {
+ if (StringUtils.isNotBlank(app)) {
var appDefine = appDefines.get(app.toLowerCase());
if (appDefine == null) {
throw new IllegalArgumentException("The app " + app + " not
support.");
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java
index 519cec7d5..b87965b41 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java
@@ -22,6 +22,8 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.entity.dto.CollectorSummary;
import org.apache.hertzbeat.common.entity.manager.Collector;
import org.apache.hertzbeat.common.entity.manager.CollectorMonitorBind;
@@ -68,7 +70,7 @@ public class CollectorServiceImpl implements CollectorService
{
}
Specification<Collector> specification = (root, query,
criteriaBuilder) -> {
Predicate predicate = criteriaBuilder.conjunction();
- if (name != null && !name.isEmpty()) {
+ if (StringUtils.isNotBlank(name)) {
Predicate predicateName =
criteriaBuilder.like(root.get("name"), "%" + name + "%");
predicate = criteriaBuilder.and(predicateName);
}
@@ -93,13 +95,13 @@ public class CollectorServiceImpl implements
CollectorService {
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteRegisteredCollector(List<String> collectors) {
- if (collectors == null || collectors.isEmpty()) {
+ if (CollectionUtils.isEmpty(collectors)) {
return;
}
// Determine whether there are fixed tasks on the collector
collectors.forEach(collector -> {
List<CollectorMonitorBind> binds =
this.collectorMonitorBindDao.findCollectorMonitorBindsByCollector(collector);
- if (!binds.isEmpty()) {
+ if (CollectionUtils.isNotEmpty(binds)) {
throw new CommonException("The collector " + collector + " has
pinned tasks that cannot be deleted.");
}
});
@@ -128,14 +130,14 @@ public class CollectorServiceImpl implements
CollectorService {
@Override
public void makeCollectorsOffline(List<String> collectors) {
- if (collectors != null) {
+ if (CollectionUtils.isNotEmpty(collectors)) {
collectors.forEach(collector ->
this.manageServer.getCollectorAndJobScheduler().offlineCollector(collector));
}
}
@Override
public void makeCollectorsOnline(List<String> collectors) {
- if (collectors != null) {
+ if (CollectionUtils.isNotEmpty(collectors)) {
collectors.forEach(collector ->
this.manageServer.getCollectorAndJobScheduler().onlineCollector(collector));
}
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ConfigServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ConfigServiceImpl.java
index 345e2b3b4..a84e18b0f 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ConfigServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ConfigServiceImpl.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig;
import org.apache.hertzbeat.manager.service.ConfigService;
import org.apache.hertzbeat.manager.service.GeneralConfigService;
@@ -39,7 +40,7 @@ public class ConfigServiceImpl implements ConfigService {
public ConfigServiceImpl(List<GeneralConfigService> generalConfigServices){
configServiceMap = new ConcurrentHashMap<>(8);
- if (generalConfigServices != null) {
+ if (CollectionUtils.isNotEmpty(generalConfigServices)) {
generalConfigServices.forEach(config ->
configServiceMap.put(config.type(), config));
}
}
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java
index b3802dd7f..671d2a6a4 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java
@@ -30,6 +30,7 @@ import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -43,7 +44,6 @@ import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.RegionUtil;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
/**
* Configure the import and export EXCEL format
@@ -89,14 +89,14 @@ public class ExcelImExportServiceImpl extends
AbstractImExportServiceImpl{
continue;
}
String name = getCellValueAsString(row.getCell(0));
- if (StringUtils.hasText(name)) {
+ if (StringUtils.isNotBlank(name)) {
startRowList.add(row.getRowNum());
MonitorDTO monitor = extractMonitorDataFromRow(row);
ExportMonitorDTO exportMonitor = new ExportMonitorDTO();
exportMonitor.setMonitor(monitor);
monitors.add(exportMonitor);
String metrics = getCellValueAsString(row.getCell(11));
- if (StringUtils.hasText(metrics)) {
+ if (StringUtils.isNotBlank(metrics)) {
List<String> metricList =
Arrays.stream(metrics.split(",")).collect(Collectors.toList());
exportMonitor.setMetrics(metricList);
}
@@ -145,7 +145,7 @@ public class ExcelImExportServiceImpl extends
AbstractImExportServiceImpl{
monitor.setDescription(getCellValueAsString(row.getCell(5)));
String tagsString = getCellValueAsString(row.getCell(6));
- if (StringUtils.hasText(tagsString)) {
+ if (StringUtils.isNotBlank(tagsString)) {
List<Long> tags = Arrays.stream(tagsString.split(","))
.map(Long::parseLong)
.collect(Collectors.toList());
@@ -159,7 +159,7 @@ public class ExcelImExportServiceImpl extends
AbstractImExportServiceImpl{
private ParamDTO extractParamDataFromRow(Row row) {
String fieldName = getCellValueAsString(row.getCell(8));
- if (StringUtils.hasText(fieldName)) {
+ if (StringUtils.isNotBlank(fieldName)) {
ParamDTO param = new ParamDTO();
param.setField(fieldName);
param.setType(getCellValueAsByte(row.getCell(9)));
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
index 8763db63d..cd0ea218b 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
@@ -37,6 +37,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.alert.dao.AlertDefineBindDao;
import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -87,7 +88,6 @@ import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -176,7 +176,7 @@ public class MonitorServiceImpl implements MonitorService {
}
monitor.setStatus(CommonConstants.MONITOR_UP_CODE);
// If the detection result fails, a detection exception is thrown
- if (collectRep == null || collectRep.isEmpty()) {
+ if (CollectionUtils.isEmpty(collectRep)) {
monitor.setStatus(CommonConstants.MONITOR_DOWN_CODE);
throw new MonitorDetectException("Collect Timeout No Response");
}
@@ -193,7 +193,7 @@ public class MonitorServiceImpl implements MonitorService {
long monitorId = SnowFlakeIdGenerator.generateId();
// Init Set Default Tags: monitorId monitorName app
List<Tag> tags = monitor.getTags();
- if (tags == null) {
+ if (CollectionUtils.isEmpty(tags)) {
tags = new LinkedList<>();
monitor.setTags(tags);
}
@@ -214,7 +214,7 @@ public class MonitorServiceImpl implements MonitorService {
}).collect(Collectors.toList());
appDefine.setConfigmap(configmaps);
- long jobId = collector == null ?
collectJobScheduling.addAsyncCollectJob(appDefine, null) :
+ long jobId = StringUtils.isBlank(collector) ?
collectJobScheduling.addAsyncCollectJob(appDefine, null) :
collectJobScheduling.addAsyncCollectJob(appDefine, collector);
try {
@@ -244,7 +244,7 @@ public class MonitorServiceImpl implements MonitorService {
public void addNewMonitorOptionalMetrics(List<String> metrics, Monitor
monitor, List<Param> params) {
long monitorId = SnowFlakeIdGenerator.generateId();
List<Tag> tags = monitor.getTags();
- if (tags == null) {
+ if (CollectionUtils.isEmpty(tags)) {
tags = new LinkedList<>();
monitor.setTags(tags);
}
@@ -357,11 +357,11 @@ public class MonitorServiceImpl implements MonitorService
{
}
}
}
- if (monitor.getTags() != null) {
+ if (!CollectionUtils.isEmpty(monitor.getTags())) {
monitor.setTags(monitor.getTags().stream().distinct().collect(Collectors.toList()));
}
// the dispatch collector must exist if pin
- if (StringUtils.hasText(monitorDto.getCollector())) {
+ if (StringUtils.isNotBlank(monitorDto.getCollector())) {
Optional<Collector> optionalCollector =
collectorDao.findCollectorByName(monitorDto.getCollector());
if (optionalCollector.isEmpty()) {
throw new IllegalArgumentException("The pinned collector does
not exist.");
@@ -371,14 +371,14 @@ public class MonitorServiceImpl implements MonitorService
{
}
// Parameter definition structure verification
List<ParamDefine> paramDefines =
appService.getAppParamDefines(monitorDto.getMonitor().getApp());
- if (paramDefines != null) {
+ if (!CollectionUtils.isEmpty(paramDefines)) {
for (ParamDefine paramDefine : paramDefines) {
String field = paramDefine.getField();
Param param = paramMap.get(field);
if (paramDefine.isRequired() && (param == null ||
param.getParamValue() == null)) {
throw new IllegalArgumentException("Params field " + field
+ " is required.");
}
- if (param != null && param.getParamValue() != null &&
StringUtils.hasText(param.getParamValue())) {
+ if (param != null && param.getParamValue() != null &&
StringUtils.isNotBlank(param.getParamValue())) {
switch (paramDefine.getType()) {
case "number":
double doubleValue;
@@ -517,7 +517,7 @@ public class MonitorServiceImpl implements MonitorService {
}
// Auto Update Default Tags: monitorName
List<Tag> tags = monitor.getTags();
- if (tags == null) {
+ if (CollectionUtils.isEmpty(tags)) {
tags = new LinkedList<>();
monitor.setTags(tags);
}
@@ -647,14 +647,14 @@ public class MonitorServiceImpl implements MonitorService
{
public Page<Monitor> getMonitors(List<Long> monitorIds, String app, String
name, String host, Byte status, String sort, String order, int pageIndex, int
pageSize, String tag) {
Specification<Monitor> specification = (root, query, criteriaBuilder)
-> {
List<Predicate> andList = new ArrayList<>();
- if (monitorIds != null && !monitorIds.isEmpty()) {
+ if (!CollectionUtils.isEmpty(monitorIds)) {
CriteriaBuilder.In<Long> inPredicate =
criteriaBuilder.in(root.get("id"));
for (long id : monitorIds) {
inPredicate.value(id);
}
andList.add(inPredicate);
}
- if (StringUtils.hasText(app)) {
+ if (StringUtils.isNotBlank(app)) {
Predicate predicateApp =
criteriaBuilder.equal(root.get("app"), app);
andList.add(predicateApp);
}
@@ -663,7 +663,7 @@ public class MonitorServiceImpl implements MonitorService {
andList.add(predicateStatus);
}
- if (StringUtils.hasText(tag)) {
+ if (StringUtils.isNotBlank(tag)) {
String[] tagArr = tag.split(":");
String tagName = tagArr[0];
ListJoin<Monitor, Tag> tagJoin = root
@@ -681,11 +681,11 @@ public class MonitorServiceImpl implements MonitorService
{
Predicate andPredicate =
criteriaBuilder.and(andList.toArray(andPredicates));
List<Predicate> orList = new ArrayList<>();
- if (StringUtils.hasText(host)) {
+ if (StringUtils.isNotBlank(host)) {
Predicate predicateHost =
criteriaBuilder.like(root.get("host"), "%" + host + "%");
orList.add(predicateHost);
}
- if (StringUtils.hasText(name)) {
+ if (StringUtils.isNotBlank(name)) {
Predicate predicateName =
criteriaBuilder.like(root.get("name"), "%" + name + "%");
orList.add(predicateName);
}
@@ -717,7 +717,7 @@ public class MonitorServiceImpl implements MonitorService {
monitor.getStatus() !=
CommonConstants.MONITOR_PAUSED_CODE)
.peek(monitor ->
monitor.setStatus(CommonConstants.MONITOR_PAUSED_CODE))
.collect(Collectors.toList());
- if (!managedMonitors.isEmpty()) {
+ if (!CollectionUtils.isEmpty(managedMonitors)) {
for (Monitor monitor : managedMonitors) {
collectJobScheduling.cancelAsyncCollectJob(monitor.getJobId());
}
@@ -733,7 +733,7 @@ public class MonitorServiceImpl implements MonitorService {
monitor.getStatus() ==
CommonConstants.MONITOR_PAUSED_CODE)
.peek(monitor ->
monitor.setStatus(CommonConstants.MONITOR_UP_CODE))
.collect(Collectors.toList());
- if (!unManagedMonitors.isEmpty()) {
+ if (!CollectionUtils.isEmpty(unManagedMonitors)) {
for (Monitor monitor : unManagedMonitors) {
// Construct the collection task Job entity
Job appDefine = appService.getAppDefine(monitor.getApp());
@@ -748,7 +748,7 @@ public class MonitorServiceImpl implements MonitorService {
List<Configmap> configmaps = params.stream().map(param ->
new Configmap(param.getField(), param.getParamValue(),
param.getType())).collect(Collectors.toList());
List<ParamDefine> paramDefaultValue =
appDefine.getParams().stream()
- .filter(item ->
StringUtils.hasText(item.getDefaultValue()))
+ .filter(item ->
StringUtils.isNotBlank(item.getDefaultValue()))
.toList();
paramDefaultValue.forEach(defaultVar -> {
if (configmaps.stream().noneMatch(item ->
item.getKey().equals(defaultVar.getField()))) {
@@ -775,7 +775,7 @@ public class MonitorServiceImpl implements MonitorService {
@Override
public List<AppCount> getAllAppMonitorsCount() {
List<AppCount> appCounts = monitorDao.findAppsStatusCount();
- if (appCounts == null) {
+ if (CollectionUtils.isEmpty(appCounts)) {
return null;
}
//Statistical category information, calculate the number of
corresponding states for each monitor
@@ -854,7 +854,7 @@ public class MonitorServiceImpl implements MonitorService {
List<Configmap> configmaps = params.stream().map(param -> new
Configmap(param.getField(),
param.getParamValue(),
param.getType())).collect(Collectors.toList());
List<ParamDefine> paramDefaultValue =
appDefine.getParams().stream()
- .filter(item ->
StringUtils.hasText(item.getDefaultValue()))
+ .filter(item ->
StringUtils.isNotBlank(item.getDefaultValue()))
.toList();
paramDefaultValue.forEach(defaultVar -> {
if (configmaps.stream().noneMatch(item ->
item.getKey().equals(defaultVar.getField()))) {
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java
index df4240a17..b11f2af50 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java
@@ -31,6 +31,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.cache.CacheFactory;
import org.apache.hertzbeat.common.cache.CommonCacheService;
@@ -88,7 +89,7 @@ public class NoticeConfigServiceImpl implements
NoticeConfigService, CommandLine
public List<NoticeReceiver> getNoticeReceivers(String name) {
Specification<NoticeReceiver> specification = (root, query,
criteriaBuilder) -> {
Predicate predicate = criteriaBuilder.conjunction();
- if (name != null && !name.isEmpty()) {
+ if (StringUtils.isNotBlank(name)) {
Predicate predicateName =
criteriaBuilder.like(root.get("name"), "%" + name + "%");
predicate = criteriaBuilder.and(predicateName);
}
@@ -101,7 +102,7 @@ public class NoticeConfigServiceImpl implements
NoticeConfigService, CommandLine
public List<NoticeTemplate> getNoticeTemplates(String name) {
Specification<NoticeTemplate> specification = (root, query,
criteriaBuilder) -> {
Predicate predicate = criteriaBuilder.conjunction();
- if (name != null && StringUtils.isNoneBlank(name)) {
+ if (StringUtils.isNotBlank(name)) {
Predicate predicateName =
criteriaBuilder.like(root.get("name"), "%" + name + "%");
predicate = criteriaBuilder.and(predicateName);
}
@@ -116,7 +117,7 @@ public class NoticeConfigServiceImpl implements
NoticeConfigService, CommandLine
public List<NoticeRule> getNoticeRules(String name) {
Specification<NoticeRule> specification = (root, query,
criteriaBuilder) -> {
Predicate predicate = criteriaBuilder.conjunction();
- if (name != null && !name.isEmpty()) {
+ if (StringUtils.isNotBlank(name)) {
Predicate predicateName =
criteriaBuilder.like(root.get("name"), "%" + name + "%");
predicate = criteriaBuilder.and(predicateName);
}
@@ -164,7 +165,7 @@ public class NoticeConfigServiceImpl implements
NoticeConfigService, CommandLine
// use cache
CommonCacheService<String, Object> noticeCache =
CacheFactory.getNoticeCache();
List<NoticeRule> rules = (List<NoticeRule>)
noticeCache.get(CommonConstants.CACHE_NOTICE_RULE);
- if (rules == null) {
+ if (CollectionUtils.isEmpty(rules)) {
rules = noticeRuleDao.findNoticeRulesByEnableTrue();
noticeCache.put(CommonConstants.CACHE_NOTICE_RULE, rules);
}
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
index 74f555644..2340c26f8 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
@@ -83,7 +83,7 @@ public class TagServiceImpl implements TagService {
Predicate andPredicate =
criteriaBuilder.and(andList.toArray(andPredicates));
List<Predicate> orList = new ArrayList<>();
- if (search != null && !search.isEmpty()) {
+ if (StringUtils.isNotBlank(search)) {
Predicate predicateName =
criteriaBuilder.like(root.get("name"), "%" + search + "%");
orList.add(predicateName);
Predicate predicateValue =
criteriaBuilder.like(root.get("tagValue"), "%" + search + "%");
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java
index a89afc771..8d4bfb255 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java
@@ -21,13 +21,13 @@ import jakarta.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* Test case for {@link DingTalkRobotAlertNotifyHandlerImpl}
@@ -41,7 +41,7 @@ class DingTalkRobotAlertNotifyHandlerImplTest extends
AbstractSpringIntegrationT
@Test
void send() {
String ddAccessToken = System.getenv("DD_ACCESS_TOKEN");
- if (!StringUtils.hasText(ddAccessToken)) {
+ if (StringUtils.isBlank(ddAccessToken)) {
log.warn("Please provide environment variables DD_ACCESS_TOKEN");
return;
}
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java
index 04d567399..ff5ca3436 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java
@@ -20,13 +20,13 @@ package org.apache.hertzbeat.manager.component.alerter.impl;
import jakarta.annotation.Resource;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* Test case for {@link DiscordBotAlertNotifyHandlerImpl}
@@ -41,7 +41,7 @@ class DiscordBotAlertNotifyHandlerImplTest extends
AbstractSpringIntegrationTest
void send() {
var discordChannelId = System.getenv("DISCORD_CHANNEL_ID");
var discordBotToken = System.getenv("DISCORD_BOT_TOKEN");
- if (!StringUtils.hasText(discordChannelId) ||
!StringUtils.hasText(discordBotToken)) {
+ if (StringUtils.isBlank(discordChannelId) ||
StringUtils.isBlank(discordBotToken)) {
log.warn("Please provide environment variables DISCORD_CHANNEL_ID,
DISCORD_BOT_TOKEN");
return;
}
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java
index f66bc82ce..e6bd03da3 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java
@@ -21,13 +21,13 @@ import jakarta.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* Test case for {@link FlyBookAlertNotifyHandlerImpl}
@@ -41,7 +41,7 @@ class FlyBookAlertNotifyHandlerImplTest extends
AbstractSpringIntegrationTest {
@Test
void send() {
String flyBookId = System.getenv("FLY_BOOK_ID");
- if (!StringUtils.hasText(flyBookId)) {
+ if (StringUtils.isBlank(flyBookId)) {
log.warn("Please provide environment variables FLY_BOOK_ID");
return;
}
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java
index fb19e220d..8b6d69778 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java
@@ -18,13 +18,13 @@ package org.apache.hertzbeat.manager.component.alerter.impl;
import jakarta.annotation.Resource;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* Test case for {@link HuaweiCloudSmnAlertNotifyHandlerImpl}
@@ -38,27 +38,27 @@ class HuaweiCloudSmnAlertNotifyHandlerImplTest extends
AbstractSpringIntegration
@Test
void send() throws InterruptedException {
var smnProjectId = System.getenv("SMN_PROJECT_ID");
- if (!StringUtils.hasText(smnProjectId)) {
+ if (StringUtils.isBlank(smnProjectId)) {
log.warn("Please provide environment variables SMN_PROJECT_ID");
return;
}
var smnAk = System.getenv("SMN_AK");
- if (!StringUtils.hasText(smnAk)) {
+ if (StringUtils.isBlank(smnAk)) {
log.warn("Please provide environment variables SMN_AK");
return;
}
var smnSk = System.getenv("SMN_SK");
- if (!StringUtils.hasText(smnSk)) {
+ if (StringUtils.isBlank(smnSk)) {
log.warn("Please provide environment variables SMN_SK");
return;
}
var smnRegion = System.getenv("SMN_REGION");
- if (!StringUtils.hasText(smnRegion)) {
+ if (StringUtils.isBlank(smnRegion)) {
log.warn("Please provide environment variables SMN_REGION");
return;
}
var smnTopicUrn = System.getenv("SMN_TOPIC_URN");
- if (!StringUtils.hasText(smnTopicUrn)) {
+ if (StringUtils.isBlank(smnTopicUrn)) {
log.warn("Please provide environment variables SMN_TOPIC_URN");
return;
}
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java
index fe289cd17..3261798a2 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java
@@ -20,13 +20,13 @@ package org.apache.hertzbeat.manager.component.alerter.impl;
import jakarta.annotation.Resource;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* Test case for {@link SlackAlertNotifyHandlerImpl}
@@ -42,7 +42,7 @@ class SlackAlertNotifyHandlerImplTest extends
AbstractSpringIntegrationTest {
@Test
void send() {
var slackWebHook = System.getenv("SLACK_WEB_HOOK");
- if (!StringUtils.hasText(slackWebHook)) {
+ if (StringUtils.isBlank(slackWebHook)) {
log.warn("Please provide environment variables SLACK_WEB_HOOK");
return;
}
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java
index f8f9d0a19..438fdf527 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java
@@ -21,13 +21,13 @@ import jakarta.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* Test case for {@link TelegramBotAlertNotifyHandlerImpl}
@@ -44,7 +44,7 @@ class TelegramBotAlertNotifyHandlerImplTest extends
AbstractSpringIntegrationTes
void send() {
String tgBotToken = System.getenv("TG_BOT_TOKEN");
String tgUserId = System.getenv("TG_USER_ID");
- if (!StringUtils.hasText(tgBotToken) ||
!StringUtils.hasText(tgUserId)) {
+ if (StringUtils.isBlank(tgBotToken) || StringUtils.isBlank(tgUserId)) {
log.warn("Please provide environment variables TG_BOT_TOKEN,
TG_USER_ID");
return;
}
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java
index 956e38983..642d8f8d5 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java
@@ -21,13 +21,13 @@ import jakarta.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* unit test case for WeChatAppAlertNotifyHandlerImpl
@@ -43,7 +43,7 @@ public class WeChatAppAlertNotifyHandlerImplTest extends
AbstractSpringIntegrati
String corpId = System.getenv("CORP_ID");
String agentId = System.getenv("AGENT_ID");
String appSecret = System.getenv("APP_SECRET");
- if (!StringUtils.hasText(corpId) || !StringUtils.hasText(agentId) ||
!StringUtils.hasText(appSecret)) {
+ if (StringUtils.isBlank(corpId) || StringUtils.isBlank(agentId) ||
StringUtils.isBlank(appSecret)) {
log.warn("Please provide environment variables CORP_ID, TG_USER_ID
APP_SECRET");
return;
}
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeComRobotAlertNotifyHandlerImplTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeComRobotAlertNotifyHandlerImplTest.java
index 23b8ff110..08de0ed30 100644
---
a/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeComRobotAlertNotifyHandlerImplTest.java
+++
b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeComRobotAlertNotifyHandlerImplTest.java
@@ -21,13 +21,13 @@ import jakarta.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.manager.NoticeReceiver;
import org.apache.hertzbeat.common.entity.manager.NoticeTemplate;
import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
/**
* Test case for {@link WeComRobotAlertNotifyHandlerImpl}
@@ -41,7 +41,7 @@ class WeComRobotAlertNotifyHandlerImplTest extends
AbstractSpringIntegrationTest
@Test
void send() {
String weWorkKey = System.getenv("WE_WORK_KEY");
- if (!StringUtils.hasText(weWorkKey)) {
+ if (StringUtils.isBlank(weWorkKey)) {
log.warn("Please provide environment variables WE_WORK_KEY");
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
