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 39a587f0c [bugfix] fix AlertTemplateUtilTest test exception and update
code style (#1969)
39a587f0c is described below
commit 39a587f0c3495191c7ab8f92bfc96bf3f630891f
Author: YuLuo <[email protected]>
AuthorDate: Mon May 13 11:01:49 2024 +0800
[bugfix] fix AlertTemplateUtilTest test exception and update code style
(#1969)
Signed-off-by: yuluo-yx <[email protected]>
Co-authored-by: tomsun28 <[email protected]>
---
.../src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java | 3 ---
.../apache/hertzbeat/alert/service/AlertDefineImExportService.java | 1 -
.../alert/service/impl/AlertDefineAbstractImExportServiceImpl.java | 1 -
.../alert/service/impl/AlertDefineExcelImExportServiceImpl.java | 3 ---
.../alert/service/impl/AlertDefineJsonImExportServiceImpl.java | 2 --
.../alert/service/impl/AlertDefineYamlImExportServiceImpl.java | 3 ---
.../org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java | 3 ---
.../main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java | 4 ++++
alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java | 3 ++-
alerter/src/main/resources/META-INF/spring.factories | 2 +-
.../test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java | 3 +--
.../org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java | 2 +-
.../java/org/apache/hertzbeat/alert/service/AlertServiceTest.java | 2 +-
13 files changed, 10 insertions(+), 22 deletions(-)
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
index edae03485..486dbaef3 100644
--- a/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
+++ b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
@@ -112,8 +112,5 @@ public class AlerterProperties {
private String groupId;
}
-
}
-
-
}
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java
index 78bc4a19e..dfcbb1973 100644
---
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java
+++
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
-
/**
* Configuration Import Export
*/
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java
index 3dc25e09a..2900b0fe3 100644
---
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java
+++
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java
@@ -17,7 +17,6 @@
package org.apache.hertzbeat.alert.service.impl;
-
import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java
index a91e74fd8..88fa777ba 100644
---
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java
+++
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java
@@ -39,7 +39,6 @@ import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-
/**
* Configure the import and export EXCEL format
*/
@@ -263,6 +262,4 @@ public class AlertDefineExcelImExportServiceImpl extends
AlertDefineAbstractImEx
throw new RuntimeException(e);
}
}
-
-
}
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java
index 37f4ba51e..75bf8b097 100644
---
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java
+++
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java
@@ -17,7 +17,6 @@
package org.apache.hertzbeat.alert.service.impl;
-
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
@@ -28,7 +27,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-
/**
* Configure the import and export JSON format
*/
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java
index bdd88cb3e..2dacffe4a 100644
---
a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java
+++
b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java
@@ -17,7 +17,6 @@
package org.apache.hertzbeat.alert.service.impl;
-
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -28,7 +27,6 @@ import org.springframework.stereotype.Service;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
-
/**
* Configure the import and export Yaml format
*/
@@ -39,7 +37,6 @@ public class AlertDefineYamlImExportServiceImpl extends
AlertDefineAbstractImExp
public static final String TYPE = "YAML";
public static final String FILE_SUFFIX = ".yaml";
-
@Override
public String type() {
return TYPE;
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 d744d8a94..ffdca29f9 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
@@ -158,7 +158,4 @@ public class AlertServiceImpl implements AlertService {
.gmtUpdate(dateTime)
.build();
}
-
-
-
}
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java
index 69be45bcf..1efb010d5 100644
---
a/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java
+++
b/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java
@@ -38,6 +38,10 @@ public class AlertTemplateUtil {
if (template == null) {
return null;
}
+ if (replaceData == null) {
+ log.warn("The replaceData is null.");
+ return template;
+ }
try {
Matcher matcher = PATTERN.matcher(template);
StringBuilder builder = new StringBuilder();
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java
index c9c81583d..cba3c7530 100644
--- a/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java
+++ b/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java
@@ -29,7 +29,8 @@ public class DateUtil {
private static final String[] DATE_FORMATS = {
"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
- "yyyy-MM-dd HH:mm:ss"};
+ "yyyy-MM-dd HH:mm:ss"
+ };
/**
* convert date to timestamp
diff --git a/alerter/src/main/resources/META-INF/spring.factories
b/alerter/src/main/resources/META-INF/spring.factories
index 35a92d630..13843a794 100644
--- a/alerter/src/main/resources/META-INF/spring.factories
+++ b/alerter/src/main/resources/META-INF/spring.factories
@@ -14,4 +14,4 @@
# limitations under the License.
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.hertzbeat.alert.config.AlerterAutoConfiguration
\ No newline at end of file
+org.apache.hertzbeat.alert.config.AlerterAutoConfiguration
diff --git
a/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java
b/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java
index 442c0873a..4b7a61a95 100644
---
a/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java
+++
b/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-
/**
* Test case for {@link AlerterWorkerPool}
*/
@@ -53,4 +52,4 @@ class AlerterWorkerPoolTest {
assertEquals(NUMBER_OF_THREADS, counter.get());
}
-}
\ No newline at end of file
+}
diff --git
a/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java
b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java
index cf9d655f5..b3b317db7 100644
---
a/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java
+++
b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java
@@ -187,4 +187,4 @@ class AlertDefineServiceTest {
when(alertDefineBindDao.getAlertDefineBindsByAlertDefineIdEquals(id)).thenReturn(alertDefineMonitorBinds);
assertDoesNotThrow(() ->
alertDefineService.getBindAlertDefineMonitors(id));
}
-}
\ No newline at end of file
+}
diff --git
a/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java
b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java
index d32352e31..9a7606362 100644
---
a/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java
+++
b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java
@@ -56,4 +56,4 @@ class AlertServiceTest {
@Test
void addNewAlertReport() {
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
