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 22459c5b6 [improve] add some code style improve (#2376)
22459c5b6 is described below
commit 22459c5b6f4a1348dfffa02f925bf0f6550b6aae
Author: aias00 <[email protected]>
AuthorDate: Sun Jul 28 19:14:04 2024 +0800
[improve] add some code style improve (#2376)
Signed-off-by: tomsun28 <[email protected]>
Co-authored-by: tomsun28 <[email protected]>
---
.../alert/service/impl/AlertServiceImpl.java | 4 +--
.../collector/collect/http/HttpCollectImpl.java | 4 +--
...rseCreater.java => PrometheusParseCreator.java} | 8 ++---
.../collector/collect/push/PushCollectImpl.java | 2 +-
.../collect/redis/RedisCommonCollectImpl.java | 4 +--
.../collect/script/ScriptCollectImpl.java | 7 ++---
.../collector/collect/snmp/SnmpCollectImpl.java | 13 ++------
.../collector/collect/ssh/SshCollectImpl.java | 7 ++---
.../collect/icmp/IcmpCollectImplTest.java | 12 ++------
.../collect/imap/ImapCollectImplTest.java | 12 ++------
.../memcached/MemcachedCollectImplTest.java | 12 ++------
.../collect/nginx/NginxCollectImplTest.java | 6 ++--
.../collector/collect/ntp/NtpCollectImplTest.java | 1 -
.../collector/collect/udp/UdpCollectImplTest.java | 12 +++-----
.../common/support/SpringContextHolder.java | 3 +-
.../hertzbeat/common/util/TimePeriodUtilTest.java | 4 +--
.../manager/component/alerter/DispatcherAlarm.java | 26 ++++++++--------
.../alerter/impl/WeChatAlertNotifyHandlerImpl.java | 3 +-
.../manager/config/AngularErrorViewResolver.java | 3 +-
.../manager/config/HeaderRequestInterceptor.java | 3 +-
.../manager/controller/AccountController.java | 1 +
.../controller/GeneralConfigController.java | 2 +-
.../nativex/HertzbeatRuntimeHintsRegistrar.java | 3 +-
.../org/apache/hertzbeat/manager/ManagerTest.java | 4 +--
.../push/service/impl/PushServiceImpl.java | 2 +-
.../hertzbeat/remoting/RemotingServiceTest.java | 4 +--
.../history/greptime/GreptimeDbDataStorage.java | 2 +-
.../store/history/iotdb/IotDbDataStorage.java | 6 ++--
.../store/history/jpa/JpaDatabaseDataStorage.java | 36 ++++++++--------------
.../store/realtime/redis/RedisDataStorage.java | 16 +++++-----
.../controller/MetricsDataControllerTest.java | 12 +++-----
31 files changed, 88 insertions(+), 146 deletions(-)
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
index ffdca29f9..a817d6123 100644
---
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
+++
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
@@ -137,9 +137,7 @@ public class AlertServiceImpl implements AlertService {
StringBuilder sb = new StringBuilder();
if (alertReport.getContent() == null ||
alertReport.getContent().length() <= 0){
StringBuilder finalSb = sb;
- annotations.forEach((k, v) -> {
- finalSb.append(k).append(":").append(v).append("\n");
- });
+ annotations.forEach((k, v) ->
finalSb.append(k).append(":").append(v).append("\n"));
} else {
sb = new StringBuilder(alertReport.getContent());
}
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java
index 7264c8c9b..c2c48f48e 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java
@@ -45,7 +45,7 @@ import org.apache.commons.net.util.Base64;
import org.apache.hertzbeat.collector.collect.AbstractCollect;
import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
import
org.apache.hertzbeat.collector.collect.http.promethus.AbstractPrometheusParse;
-import
org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater;
+import
org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreator;
import
org.apache.hertzbeat.collector.collect.http.promethus.exporter.ExporterParser;
import
org.apache.hertzbeat.collector.collect.http.promethus.exporter.MetricFamily;
import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
@@ -375,7 +375,7 @@ public class HttpCollectImpl extends AbstractCollect {
private void parseResponseByPromQl(String resp, List<String> aliasFields,
HttpProtocol http,
CollectRep.MetricsData.Builder builder)
{
- AbstractPrometheusParse prometheusParser =
PrometheusParseCreater.getPrometheusParse();
+ AbstractPrometheusParse prometheusParser =
PrometheusParseCreator.getPrometheusParse();
prometheusParser.handle(resp, aliasFields, http, builder);
}
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreator.java
similarity index 80%
rename from
collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java
rename to
collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreator.java
index 8078ec068..72b83e33c 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreator.java
@@ -26,15 +26,15 @@ import org.springframework.stereotype.Component;
*/
@Slf4j
@Component
-public class PrometheusParseCreater implements InitializingBean {
- private static AbstractPrometheusParse PROMETHEUSPARSE = new
PrometheusVectorParser();
+public class PrometheusParseCreator implements InitializingBean {
+ private static final AbstractPrometheusParse PROMETHEUS_PARSE = new
PrometheusVectorParser();
private static void create() {
- PROMETHEUSPARSE.setInstance(new
PrometheusMatrixParser().setInstance(new PrometheusLastParser()));
+ PROMETHEUS_PARSE.setInstance(new
PrometheusMatrixParser().setInstance(new PrometheusLastParser()));
}
public static AbstractPrometheusParse getPrometheusParse(){
- return PROMETHEUSPARSE;
+ return PROMETHEUS_PARSE;
}
@Override
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java
index 86f4fe083..3757cf2d2 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java
@@ -53,7 +53,7 @@ import org.apache.http.util.EntityUtils;
@Slf4j
public class PushCollectImpl extends AbstractCollect {
- private static Map<Long, Long> timeMap = new ConcurrentHashMap<>();
+ private static final Map<Long, Long> timeMap = new ConcurrentHashMap<>();
// ms
private static final Integer timeout = 3000;
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java
index ef4a5bbb2..2c5a6d73f 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java
@@ -316,9 +316,7 @@ public class RedisCommonCollectImpl extends AbstractCollect
{
.map(this::removeCr)
.map(r -> r.split(SignConstants.DOUBLE_MARK))
.filter(t -> t.length > 1)
- .forEach(it -> {
- result.put(it[0], it[1]);
- });
+ .forEach(it -> result.put(it[0], it[1]));
// fix https://github.com/apache/hertzbeat/pull/913
if (result.size() < fieldTotalSize) {
for (Metrics.Field field : metrics.getFields()) {
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/script/ScriptCollectImpl.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/script/ScriptCollectImpl.java
index aa7dc0674..dd1c1e30a 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/script/ScriptCollectImpl.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/script/ScriptCollectImpl.java
@@ -26,6 +26,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.apache.hertzbeat.collector.collect.AbstractCollect;
@@ -202,11 +203,7 @@ public class ScriptCollectImpl extends AbstractCollect {
CollectRep.ValueRow.Builder valueRowBuilder =
CollectRep.ValueRow.newBuilder();
for (String field : aliasFields) {
String fieldValue = mapValue.get(field);
- if (fieldValue == null) {
- valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
- } else {
- valueRowBuilder.addColumns(fieldValue);
- }
+ valueRowBuilder.addColumns(Objects.requireNonNullElse(fieldValue,
CommonConstants.NULL_VALUE));
}
builder.addValues(valueRowBuilder.build());
}
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java
index 78aa80d73..97cf4a5c8 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import lombok.extern.slf4j.Slf4j;
@@ -173,11 +174,7 @@ public class SnmpCollectImpl extends AbstractCollect {
} else {
String oid = oidsMap.get(alias);
String value = oidsValueMap.get(oid);
- if (value != null) {
- valueRowBuilder.addColumns(value);
- } else {
-
valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
- }
+
valueRowBuilder.addColumns(Objects.requireNonNullElse(value,
CommonConstants.NULL_VALUE));
}
}
builder.addValues(valueRowBuilder.build());
@@ -227,11 +224,7 @@ public class SnmpCollectImpl extends AbstractCollect {
}
}
}
- if (value != null) {
- valueRowBuilder.addColumns(value);
- } else {
-
valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
- }
+
valueRowBuilder.addColumns(Objects.requireNonNullElse(value,
CommonConstants.NULL_VALUE));
}
}
builder.addValues(valueRowBuilder.build());
diff --git
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java
index 1a77c7937..236b2d195 100644
---
a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java
+++
b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java
@@ -29,6 +29,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -206,11 +207,7 @@ public class SshCollectImpl extends AbstractCollect {
CollectRep.ValueRow.Builder valueRowBuilder =
CollectRep.ValueRow.newBuilder();
for (String field : aliasFields) {
String fieldValue = mapValue.get(field);
- if (fieldValue == null) {
- valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
- } else {
- valueRowBuilder.addColumns(fieldValue);
- }
+ valueRowBuilder.addColumns(Objects.requireNonNullElse(fieldValue,
CommonConstants.NULL_VALUE));
}
builder.addValues(valueRowBuilder.build());
}
diff --git
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
index 90e393c2d..5e85a4777 100644
---
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
+++
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
@@ -76,16 +76,10 @@ class IcmpCollectImplTest {
@Test
void testPreCheck() {
- assertDoesNotThrow(() -> {
- icmpCollect.preCheck(metrics);
- });
- assertThrows(IllegalArgumentException.class, () -> {
- icmpCollect.preCheck(null);
- });
+ assertDoesNotThrow(() -> icmpCollect.preCheck(metrics));
+ assertThrows(IllegalArgumentException.class, () ->
icmpCollect.preCheck(null));
metrics.setIcmp(null);
- assertThrows(IllegalArgumentException.class, () -> {
- icmpCollect.preCheck(null);
- });
+ assertThrows(IllegalArgumentException.class, () ->
icmpCollect.preCheck(null));
}
@Test
diff --git
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/imap/ImapCollectImplTest.java
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/imap/ImapCollectImplTest.java
index eae79039a..a05b311c6 100644
---
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/imap/ImapCollectImplTest.java
+++
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/imap/ImapCollectImplTest.java
@@ -68,16 +68,10 @@ public class ImapCollectImplTest {
@Test
void preCheck() {
- assertDoesNotThrow(() -> {
- imapCollect.preCheck(metrics);
- });
- assertThrows(NullPointerException.class, () -> {
- imapCollect.preCheck(null);
- });
+ assertDoesNotThrow(() -> imapCollect.preCheck(metrics));
+ assertThrows(NullPointerException.class, () ->
imapCollect.preCheck(null));
metrics.setImap(null);
- assertThrows(NullPointerException.class, () -> {
- imapCollect.preCheck(null);
- });
+ assertThrows(NullPointerException.class, () ->
imapCollect.preCheck(null));
}
@Test
diff --git
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImplTest.java
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImplTest.java
index ea8866072..8756a8780 100644
---
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImplTest.java
+++
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImplTest.java
@@ -69,16 +69,10 @@ public class MemcachedCollectImplTest {
@Test
void testPreCheck() {
- assertDoesNotThrow(() -> {
- memcachedCollect.preCheck(metrics);
- });
- assertThrows(IllegalArgumentException.class, () -> {
- memcachedCollect.preCheck(null);
- });
+ assertDoesNotThrow(() -> memcachedCollect.preCheck(metrics));
+ assertThrows(IllegalArgumentException.class, () ->
memcachedCollect.preCheck(null));
metrics.setIcmp(null);
- assertThrows(IllegalArgumentException.class, () -> {
- memcachedCollect.preCheck(null);
- });
+ assertThrows(IllegalArgumentException.class, () ->
memcachedCollect.preCheck(null));
}
@Test
diff --git
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java
index fdaf19d9b..53b5f081c 100644
---
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java
+++
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java
@@ -81,7 +81,7 @@ public class NginxCollectImplTest {
.build();
try (MockedStatic<CommonHttpClient> mockStatic =
Mockito.mockStatic(CommonHttpClient.class)) {
- mockStatic.when(() ->
CommonHttpClient.getHttpClient()).thenReturn(client);
+
mockStatic.when(CommonHttpClient::getHttpClient).thenReturn(client);
Mockito.when(client.execute(Mockito.any(HttpUriRequest.class),
Mockito.any(HttpContext.class)))
.thenReturn(mockHttpResponse);
@@ -111,7 +111,7 @@ public class NginxCollectImplTest {
.build();
try (MockedStatic<CommonHttpClient> mockedStatic =
Mockito.mockStatic(CommonHttpClient.class)) {
- mockedStatic.when(() ->
CommonHttpClient.getHttpClient()).thenReturn(client);
+
mockedStatic.when(CommonHttpClient::getHttpClient).thenReturn(client);
Mockito.when(client.execute(Mockito.any(HttpUriRequest.class),
Mockito.any(HttpContext.class)))
.thenReturn(mockHttpResponse);
@@ -176,7 +176,7 @@ public class NginxCollectImplTest {
.build();
try (MockedStatic<CommonHttpClient> mockedStatic =
Mockito.mockStatic(CommonHttpClient.class)) {
- mockedStatic.when(() ->
CommonHttpClient.getHttpClient()).thenReturn(client);
+
mockedStatic.when(CommonHttpClient::getHttpClient).thenReturn(client);
Mockito.when(client.execute(Mockito.any(HttpUriRequest.class),
Mockito.any(HttpContext.class)))
.thenReturn(mockHttpResponse);
diff --git
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImplTest.java
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImplTest.java
index 66eb13d34..ebe138988 100644
---
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImplTest.java
+++
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImplTest.java
@@ -62,7 +62,6 @@ class NtpCollectImplTest {
packet.setReceiveTimeStamp(new TimeStamp(2000));
packet.setTransmitTime(new TimeStamp(1000));
TimeInfo timeInfo = new TimeInfo(packet, 1000, false);
- ;
MockedConstruction<NTPUDPClient> mocked =
Mockito.mockConstruction(NTPUDPClient.class, (client, context)
-> {
diff --git
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java
index cc4b89a66..652318b4e 100644
---
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java
+++
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java
@@ -95,10 +95,8 @@ class UdpCollectImplTest {
.build();
MockedConstruction<DatagramSocket> socketMockedConstruction =
- Mockito.mockConstruction(DatagramSocket.class, (socket,
context) -> {
- Mockito.doThrow(new SocketTimeoutException("test
exception"))
-
.when(socket).send(Mockito.any(DatagramPacket.class));
- });
+ Mockito.mockConstruction(DatagramSocket.class, (socket,
context) -> Mockito.doThrow(new SocketTimeoutException("test exception"))
+ .when(socket).send(Mockito.any(DatagramPacket.class)));
List<String> aliasField = new ArrayList<>();
@@ -123,10 +121,8 @@ class UdpCollectImplTest {
.build();
MockedConstruction<DatagramSocket> socketMockedConstruction =
- Mockito.mockConstruction(DatagramSocket.class, (socket,
context) -> {
- Mockito.doThrow(new PortUnreachableException("test
exception"))
-
.when(socket).send(Mockito.any(DatagramPacket.class));
- });
+ Mockito.mockConstruction(DatagramSocket.class, (socket,
context) -> Mockito.doThrow(new PortUnreachableException("test exception"))
+ .when(socket).send(Mockito.any(DatagramPacket.class)));
List<String> aliasField = new ArrayList<>();
diff --git
a/common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java
b/common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java
index 37b47994c..432a7aaf0 100644
---
a/common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java
+++
b/common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java
@@ -21,6 +21,7 @@ import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
/**
@@ -34,7 +35,7 @@ public class SpringContextHolder implements
ApplicationContextAware {
private static ConfigurableApplicationContext
configurableApplicationContext;
@Override
- public void setApplicationContext(ApplicationContext applicationContext)
throws BeansException {
+ public void setApplicationContext(@NonNull ApplicationContext
applicationContext) throws BeansException {
set(applicationContext);
if (applicationContext instanceof ConfigurableApplicationContext
context) {
configurableApplicationContext = context;
diff --git
a/common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
b/common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
index 59a7492b8..cd4ceb5c1 100644
---
a/common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
+++
b/common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
@@ -98,9 +98,7 @@ class TimePeriodUtilTest {
assertNull(result);
// invalid format (non-numeric)
- Exception exception =
assertThrows(DateTimeParseException.class, () -> {
- TimePeriodUtil.parseTokenTime("abc");
- });
+ Exception exception =
assertThrows(DateTimeParseException.class, () ->
TimePeriodUtil.parseTokenTime("abc"));
assertNotNull(exception.getMessage());
}
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java
b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java
index 101a4c440..c57d56971 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java
@@ -143,21 +143,19 @@ public class DispatcherAlarm implements InitializingBean {
}
private void sendNotify(Alert alert) {
- matchNoticeRulesByAlert(alert).ifPresent(noticeRules -> {
- noticeRules.forEach(rule -> {
- workerPool.executeNotify(() -> {
- rule.getReceiverId()
- .forEach(receiverId -> {
- try {
-
sendNoticeMsg(getOneReceiverById(receiverId),
-
getOneTemplateById(rule.getTemplateId()), alert);
- } catch (AlertNoticeException e) {
- log.warn("DispatchTask sendNoticeMsg
error, message: {}", e.getMessage());
- }
- });
- });
+ matchNoticeRulesByAlert(alert).ifPresent(noticeRules ->
noticeRules.forEach(rule -> {
+ workerPool.executeNotify(() -> {
+ rule.getReceiverId()
+ .forEach(receiverId -> {
+ try {
+ sendNoticeMsg(getOneReceiverById(receiverId),
+ getOneTemplateById(rule.getTemplateId()),
alert);
+ } catch (AlertNoticeException e) {
+ log.warn("DispatchTask sendNoticeMsg error,
message: {}", e.getMessage());
+ }
+ });
});
- });
+ }));
}
}
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java
index 71f4d3361..7132776b5 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java
@@ -59,8 +59,7 @@ final class WeChatAlertNotifyHandlerImpl extends
AbstractAlertNotifyHandlerImpl
.GET()
.build();
HttpResponse<String> response = client.send(request,
HttpResponse.BodyHandlers.ofString());
- JsonParser parser = new JsonParser();
- JsonObject jsonObject =
parser.parse(response.body()).getAsJsonObject();
+ JsonObject jsonObject =
JsonParser.parseString(response.body()).getAsJsonObject();
String accessToken = null;
if (jsonObject.has(ACCESS_TOKEN)) {
accessToken = jsonObject.get(ACCESS_TOKEN).getAsString();
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java
b/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java
index ad3f3a985..15d9a7370 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java
@@ -33,6 +33,7 @@ import org.springframework.core.Ordered;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
+import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.servlet.ModelAndView;
@@ -134,7 +135,7 @@ public class AngularErrorViewResolver implements
ErrorViewResolver, Ordered {
}
@Override
- public void render(Map<String, ?> model, HttpServletRequest request,
HttpServletResponse response)
+ public void render(Map<String, ?> model, @NonNull HttpServletRequest
request, HttpServletResponse response)
throws Exception {
response.setContentType(getContentType());
FileCopyUtils.copy(this.resource.getInputStream(),
response.getOutputStream());
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java
b/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java
index 7c8cf348c..08a92528f 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java
@@ -24,6 +24,7 @@ import org.springframework.http.MediaType;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.lang.NonNull;
/**
* Rest Template interceptor adds request header information
@@ -31,7 +32,7 @@ import org.springframework.http.client.ClientHttpResponse;
public class HeaderRequestInterceptor implements ClientHttpRequestInterceptor {
@Override
- public ClientHttpResponse intercept(HttpRequest request, byte[] body,
ClientHttpRequestExecution execution)
+ public ClientHttpResponse intercept(HttpRequest request, @NonNull byte[]
body, @NonNull ClientHttpRequestExecution execution)
throws IOException {
// Send json by default
if (request.getHeaders().getContentType() == null) {
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java
b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java
index 29a53fbe5..f01731cab 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java
@@ -48,6 +48,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping(value = "/api/account/auth", produces =
{APPLICATION_JSON_VALUE})
@Slf4j
public class AccountController {
+
@Autowired
private AccountService accountService;
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java
b/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java
index c2857eeac..49f48d482 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java
@@ -47,7 +47,7 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "Alert sender Configuration API")
@Slf4j
public class GeneralConfigController {
- private Map<String, GeneralConfigService> configServiceMap;
+ private final Map<String, GeneralConfigService> configServiceMap;
public GeneralConfigController(List<GeneralConfigService>
generalConfigServices) {
configServiceMap = new HashMap<>(8);
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java
b/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java
index d1d58f01a..44d9b3a6a 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java
@@ -33,6 +33,7 @@ import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
+import org.springframework.lang.NonNull;
import org.springframework.util.ClassUtils;
/**
@@ -44,7 +45,7 @@ public class HertzbeatRuntimeHintsRegistrar implements
RuntimeHintsRegistrar {
private static final String SshConstantsClassName =
"org.apache.sshd.common.SshConstants";
@Override
- public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+ public void registerHints(@NonNull RuntimeHints hints, ClassLoader
classLoader) {
// see:
https://github.com/spring-cloud/spring-cloud-config/blob/main/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/ConfigServerRuntimeHints.java
// TODO: move over to GraalVM reachability metadata
if (ClassUtils.isPresent(SshConstantsClassName, classLoader)) {
diff --git
a/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java
b/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java
index 14a9a5040..3925f3179 100644
--- a/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java
+++ b/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java
@@ -30,7 +30,7 @@ import org.apache.hertzbeat.alert.controller.AlertsController;
import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
import org.apache.hertzbeat.alert.service.impl.AlertServiceImpl;
import org.apache.hertzbeat.collector.collect.database.JdbcSpiLoader;
-import
org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater;
+import
org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreator;
import org.apache.hertzbeat.collector.collect.strategy.CollectStrategyFactory;
import org.apache.hertzbeat.collector.dispatch.CommonDispatcher;
import org.apache.hertzbeat.collector.dispatch.DispatchProperties;
@@ -83,7 +83,7 @@ class ManagerTest extends AbstractSpringIntegrationTest {
assertNotNull(ctx.getBean(WorkerPool.class));
assertNotNull(ctx.getBean(CollectJobService.class));
assertNotNull(ctx.getBean(JdbcSpiLoader.class));
- assertNotNull(ctx.getBean(PrometheusParseCreater.class));
+ assertNotNull(ctx.getBean(PrometheusParseCreator.class));
assertNotNull(ctx.getBean(DataSizeConvert.class));
assertNotNull(ctx.getBean(CollectStrategyFactory.class));
diff --git
a/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java
b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java
index 5cdd981ca..cbd22bdb5 100644
---
a/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java
+++
b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java
@@ -128,7 +128,7 @@ public class PushServiceImpl implements PushService {
lastPushMetrics.put(monitorId, metrics);
}
catch (Exception e) {
- log.error("no metrics found, monitor id: {}, {}, {}",
monitorId, e.getMessage(), e);
+ log.error("no metrics found, monitor id: {}, {}", monitorId,
e.getMessage(), e);
return pushMetricsDto;
}
}
diff --git
a/remoting/src/test/java/org/apache/hertzbeat/remoting/RemotingServiceTest.java
b/remoting/src/test/java/org/apache/hertzbeat/remoting/RemotingServiceTest.java
index b37e23ff1..6b9831e33 100644
---
a/remoting/src/test/java/org/apache/hertzbeat/remoting/RemotingServiceTest.java
+++
b/remoting/src/test/java/org/apache/hertzbeat/remoting/RemotingServiceTest.java
@@ -139,9 +139,7 @@ public class RemotingServiceTest {
@Test
public void testNettyHook() {
this.remotingServer.registerHook(Lists.newArrayList(
- (ctx, message) -> {
- Assertions.assertEquals("hello world", message.getMsg());
- }
+ (ctx, message) -> Assertions.assertEquals("hello world",
message.getMsg())
));
this.remotingServer.registerProcessor(ClusterMsg.MessageType.HEARTBEAT, (ctx,
message) ->
diff --git
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/greptime/GreptimeDbDataStorage.java
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/greptime/GreptimeDbDataStorage.java
index aefd45e09..d0c499563 100644
---
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/greptime/GreptimeDbDataStorage.java
+++
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/greptime/GreptimeDbDataStorage.java
@@ -362,7 +362,7 @@ public class GreptimeDbDataStorage extends
AbstractHistoryDataStorage {
List<Value> values =
instanceValuesMap.computeIfAbsent(instanceValue, k -> new LinkedList<>());
try (Connection connection = hikariDataSource.getConnection();
Statement statement = connection.createStatement();
- ResultSet resultSet = statement.executeQuery(selectSql);) {
+ ResultSet resultSet = statement.executeQuery(selectSql)) {
while (resultSet.next()) {
long ts = resultSet.getLong(1);
if (ts == 0) {
diff --git
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java
index 9626ba16f..9792ef5c1 100644
---
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java
+++
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java
@@ -107,16 +107,16 @@ public class IotDbDataStorage extends
AbstractHistoryDataStorage {
boolean available = checkConnection();
if (!available) {
log.error("IotDB session pool init error with check connection");
- return available;
+ return false;
}
available = this.createDatabase();
if (!available) {
log.error("IotDB session pool init error with create database");
- return available;
+ return false;
}
this.initTtl(properties.expireTime());
log.info("IotDB session pool init success");
- return available;
+ return true;
}
private boolean checkConnection() {
diff --git
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
index 786ea2d87..9ab515754 100644
---
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
+++
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
@@ -146,34 +146,22 @@ public class JpaDatabaseDataStorage extends
AbstractHistoryDataStorage {
if (CommonConstants.NULL_VALUE.equals(columnValue)) {
switch (fieldType) {
- case CommonConstants.TYPE_NUMBER -> {
-
historyBuilder.metricType(CommonConstants.TYPE_NUMBER)
- .dou(null);
- }
- case CommonConstants.TYPE_STRING -> {
-
historyBuilder.metricType(CommonConstants.TYPE_STRING)
- .str(null);
- }
- case CommonConstants.TYPE_TIME -> {
-
historyBuilder.metricType(CommonConstants.TYPE_TIME)
- .int32(null);
- }
+ case CommonConstants.TYPE_NUMBER ->
historyBuilder.metricType(CommonConstants.TYPE_NUMBER)
+ .dou(null);
+ case CommonConstants.TYPE_STRING ->
historyBuilder.metricType(CommonConstants.TYPE_STRING)
+ .str(null);
+ case CommonConstants.TYPE_TIME ->
historyBuilder.metricType(CommonConstants.TYPE_TIME)
+ .int32(null);
default ->
historyBuilder.metricType(CommonConstants.TYPE_NUMBER);
}
} else {
switch (fieldType) {
- case CommonConstants.TYPE_NUMBER -> {
-
historyBuilder.metricType(CommonConstants.TYPE_NUMBER)
- .dou(Double.parseDouble(columnValue));
- }
- case CommonConstants.TYPE_STRING -> {
-
historyBuilder.metricType(CommonConstants.TYPE_STRING)
- .str(formatStrValue(columnValue));
- }
- case CommonConstants.TYPE_TIME -> {
-
historyBuilder.metricType(CommonConstants.TYPE_TIME)
- .int32(Integer.parseInt(columnValue));
- }
+ case CommonConstants.TYPE_NUMBER ->
historyBuilder.metricType(CommonConstants.TYPE_NUMBER)
+ .dou(Double.parseDouble(columnValue));
+ case CommonConstants.TYPE_STRING ->
historyBuilder.metricType(CommonConstants.TYPE_STRING)
+ .str(formatStrValue(columnValue));
+ case CommonConstants.TYPE_TIME ->
historyBuilder.metricType(CommonConstants.TYPE_TIME)
+ .int32(Integer.parseInt(columnValue));
default ->
historyBuilder.metricType(CommonConstants.TYPE_NUMBER)
.dou(Double.parseDouble(columnValue));
}
diff --git
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java
index 0f35cb01a..8122c882e 100644
---
a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java
+++
b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java
@@ -65,15 +65,13 @@ public class RedisDataStorage extends
AbstractRealTimeDataStorage {
return;
}
- redisCommandDelegate.operate().hset(key, hashKey, metricsData, future
-> {
- future.thenAccept(response -> {
- if (response) {
- log.debug("[warehouse] redis add new data {}:{}.", key,
hashKey);
- } else {
- log.debug("[warehouse] redis replace data {}:{}.", key,
hashKey);
- }
- });
- });
+ redisCommandDelegate.operate().hset(key, hashKey, metricsData, future
-> future.thenAccept(response -> {
+ if (response) {
+ log.debug("[warehouse] redis add new data {}:{}.", key,
hashKey);
+ } else {
+ log.debug("[warehouse] redis replace data {}:{}.", key,
hashKey);
+ }
+ }));
}
@Override
diff --git
a/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
index 995986b5e..7b4e3f4ba 100644
---
a/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
+++
b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
@@ -153,13 +153,11 @@ class MetricsDataControllerTest {
.andReturn();
when(historyDataReader.isServerAvailable()).thenReturn(true);
- ServletException exception = assertThrows(ServletException.class, ()
-> {
-
this.mockMvc.perform(MockMvcRequestBuilders.get(getUrlFail).params(params))
- .andExpect(status().isOk())
- .andExpect(jsonPath("$.code").value((int)
CommonConstants.FAIL_CODE))
- .andExpect(jsonPath("$.data").isEmpty())
- .andReturn();
- });
+ ServletException exception = assertThrows(ServletException.class, ()
-> this.mockMvc.perform(MockMvcRequestBuilders.get(getUrlFail).params(params))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value((int)
CommonConstants.FAIL_CODE))
+ .andExpect(jsonPath("$.data").isEmpty())
+ .andReturn());
assertTrue(exception.getMessage().contains("IllegalArgumentException"));
final Map<String, List<Value>> instanceValuesMap = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
