You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@hertzbeat.apache.org by go...@apache.org on 2024/05/01 08:29:47 UTC
(hertzbeat) branch bugfix-eclise-link-in-null created (now c0b3b7ffb)
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch bugfix-eclise-link-in-null
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
at c0b3b7ffb bugfix can not use empty collection as query params in eclipselink
This branch includes the following new commits:
new c0b3b7ffb bugfix can not use empty collection as query params in eclipselink
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org
(hertzbeat) 01/01: bugfix can not use empty collection as query params in eclipselink
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch bugfix-eclise-link-in-null
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit c0b3b7ffb60a8649cdda01fff3e4c52559d054aa
Author: tomsun28 <to...@outlook.com>
AuthorDate: Wed May 1 16:29:38 2024 +0800
bugfix can not use empty collection as query params in eclipselink
Signed-off-by: tomsun28 <to...@outlook.com>
---
.../manager/service/impl/AbstractImExportServiceImpl.java | 2 +-
.../hertzbeat/manager/service/impl/MonitorServiceImpl.java | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java
index 1a4be9419..1d1a68242 100644
--- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java
+++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java
@@ -135,7 +135,7 @@ abstract class AbstractImExportServiceImpl implements ImExportService {
log.debug("exportMonitor.monitor{}", exportMonitor.monitor);
if (exportMonitor.monitor != null) { // Add one more null check
BeanUtils.copyProperties(exportMonitor.monitor, monitor);
- if (exportMonitor.monitor.tags != null) {
+ if (exportMonitor.monitor.tags != null && !exportMonitor.monitor.tags.isEmpty()) {
monitor.setTags(tagService.listTag(new HashSet<>(exportMonitor.monitor.tags))
.stream()
.filter(tag -> !(tag.getName().equals(CommonConstants.TAG_MONITOR_ID) || tag.getName().equals(CommonConstants.TAG_MONITOR_NAME)))
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 67dc3e3e3..5127397b7 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
@@ -89,6 +89,7 @@ public class MonitorServiceImpl implements MonitorService {
private static final Long MONITOR_ID_TMP = 1000000000L;
public static final String HTTP = "http://";
+
public static final String HTTPS = "https://";
public static final String BLANK = "";
public static final String PATTERN_HTTP = "(?i)http://";
@@ -583,7 +584,7 @@ public class MonitorServiceImpl implements MonitorService {
@Transactional(rollbackFor = Exception.class)
public void deleteMonitors(Set<Long> ids) throws RuntimeException {
List<Monitor> monitors = monitorDao.findMonitorsByIdIn(ids);
- if (monitors != null) {
+ if (!monitors.isEmpty()) {
monitorDao.deleteAll(monitors);
paramDao.deleteParamsByMonitorIdIn(ids);
Set<Long> monitorIds = monitors.stream().map(Monitor::getId).collect(Collectors.toSet());
@@ -750,7 +751,10 @@ public class MonitorServiceImpl implements MonitorService {
public void updateAppCollectJob(Job job) {
List<Monitor> monitors = monitorDao.findMonitorsByAppEquals(job.getApp())
.stream().filter(monitor -> monitor.getStatus() != CommonConstants.UN_MANAGE_CODE)
- .collect(Collectors.toList());
+ .toList();
+ if (monitors.isEmpty()) {
+ return;
+ }
List<CollectorMonitorBind> monitorBinds = collectorMonitorBindDao.findCollectorMonitorBindsByMonitorIdIn(
monitors.stream().map(Monitor::getId).collect(Collectors.toSet()));
Map<Long, String> monitorIdCollectorMap = monitorBinds.stream().collect(
@@ -775,7 +779,7 @@ public class MonitorServiceImpl implements MonitorService {
param.getParamValue(), param.getType())).collect(Collectors.toList());
List<ParamDefine> paramDefaultValue = appDefine.getParams().stream()
.filter(item -> StringUtils.hasText(item.getDefaultValue()))
- .collect(Collectors.toList());
+ .toList();
paramDefaultValue.forEach(defaultVar -> {
if (configmaps.stream().noneMatch(item -> item.getKey().equals(defaultVar.getField()))) {
Configmap configmap = new Configmap(defaultVar.getField(), defaultVar.getDefaultValue(), (byte) 1);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org